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

(-)a/sshd.c (-4 / +7 lines)
Lines 343-353 grace_alarm_handler(int sig) Link Here
343
		kill(0, SIGTERM);
343
		kill(0, SIGTERM);
344
	}
344
	}
345
345
346
	/* XXX pre-format ipaddr/port so we don't need to access active_state */
347
	/* Log error and exit. */
346
	/* Log error and exit. */
348
	sigdie("Timeout before authentication for %s port %d",
347
	if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)
349
	    ssh_remote_ipaddr(the_active_state),
348
		cleanup_exit(255); /* don't log in privsep child */
350
	    ssh_remote_port(the_active_state));
349
	else {
350
		sigdie("Timeout before authentication for %s port %d",
351
		    ssh_remote_ipaddr(the_active_state),
352
		    ssh_remote_port(the_active_state));
353
	}
351
}
354
}
352
355
353
/* Destroy the host and server keys.  They will no longer be needed. */
356
/* Destroy the host and server keys.  They will no longer be needed. */

Return to bug 3286