Attachment #230829 for bug #278473

View | Details | Raw Unified | Return to bug 278473
Collapse All | Expand All





		d->hstent->lock = d->hstent->rLogin = d->hstent->goodExit =
			d->sdRec.how = 0;
		/* If this is a local server then we record the actual
		 * start time of the server - this is because the server
		 * can be reset without restarting and it can crash when,
		 * or after, reset - we don't want to disable it if it
		 * crashes in this case.  (See exitDisplay() below.)
		 * 'lastStart' is set in server.c to make this work.
		 */
		if ((d->displayType & d_location) != dLocal)
			d->lastStart = now;
		break;
	}
}

		} else {
			if (serverCmd == XS_RETRY) {
				if ((d->displayType & d_location) == dLocal) {
					if (he->lastExit - d->lastStart < 20) {
						logError( "Unable to fire up local display %s;"
						          " disabling.\n", d->name );
						stopDisplay( d );

Lines 76-81 Link Here

(-)kdm-4.3.5/kdm/backend/server.c.orig (+4 lines)
76		76
77	debug( "startServerOnce for %s, try %d\n", d->name, ++d->startTries );	77	debug( "startServerOnce for %s, try %d\n", d->name, ++d->startTries );
78	d->serverStatus = starting;	78	d->serverStatus = starting;
		79	/* For the local X server record the start time of the server, not the
		80	* session, so set the time here and not in dm.c:startDisplayP2()
		81	*/
		82	d->lastStart = now;
79	switch (Fork( &d->serverPid )) {	83	switch (Fork( &d->serverPid )) {
80	case 0:	84	case 0:
81	argv = prepareServerArgv( d, d->serverArgsLocal );	85	argv = prepareServerArgv( d, d->serverArgsLocal );

Return to bug 278473

Lines 1469-1475 Link Here

(-)kdm-4.3.5/kdm/backend/dm.c.orig (-2 / +10 lines)
1469		1469
1470	d->hstent->lock = d->hstent->rLogin = d->hstent->goodExit =	1470	d->hstent->lock = d->hstent->rLogin = d->hstent->goodExit =
1471	d->sdRec.how = 0;	1471	d->sdRec.how = 0;
1472	d->lastStart = now;	1472	/* If this is a local server then we record the actual
		1473	* start time of the server - this is because the server
		1474	* can be reset without restarting and it can crash when,
		1475	* or after, reset - we don't want to disable it if it
		1476	* crashes in this case. (See exitDisplay() below.)
		1477	* 'lastStart' is set in server.c to make this work.
		1478	*/
		1479	if ((d->displayType & d_location) != dLocal)
		1480	d->lastStart = now;
1473	break;	1481	break;
1474	}	1482	}
1475	}	1483	}
Lines 1558-1564 Link Here
1558	} else {	1566	} else {
1559	if (serverCmd == XS_RETRY) {	1567	if (serverCmd == XS_RETRY) {
1560	if ((d->displayType & d_location) == dLocal) {	1568	if ((d->displayType & d_location) == dLocal) {
1561	if (he->lastExit - d->lastStart < 120) {	1569	if (he->lastExit - d->lastStart < 20) {
1562	logError( "Unable to fire up local display %s;"	1570	logError( "Unable to fire up local display %s;"
1563	" disabling.\n", d->name );	1571	" disabling.\n", d->name );
1564	stopDisplay( d );	1572	stopDisplay( d );