diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-10-02 16:12:36 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-10-02 16:12:36 +1000 |
commit | 3e33cecf71860f73656a73b754cc7b7b9ec0b0ce (patch) | |
tree | 4c993022225dc70faeb42e23ff3323fd1deb717a /clientloop.c | |
parent | b210aa2cfa546d8c31f8c725d1de3050c747bd6e (diff) |
- markus@cvs.openbsd.org 2003/09/23 20:17:11
[Makefile.in auth1.c auth2.c auth.c auth.h auth-krb5.c canohost.c
cleanup.c clientloop.c fatal.c gss-serv.c log.c log.h monitor.c monitor.h
monitor_wrap.c monitor_wrap.h packet.c serverloop.c session.c session.h
ssh-agent.c sshd.c]
replace fatal_cleanup() and linked list of fatal callbacks with static
cleanup_exit() function. re-refine cleanup_exit() where appropriate,
allocate sshd's authctxt eary to allow simpler cleanup in sshd.
tested by many, ok deraadt@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/clientloop.c b/clientloop.c index bc50f0bca..d3a32a81a 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.113 2003/09/19 17:43:35 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.114 2003/09/23 20:17:11 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1384,14 +1384,9 @@ client_init_dispatch(void) | |||
1384 | 1384 | ||
1385 | /* client specific fatal cleanup */ | 1385 | /* client specific fatal cleanup */ |
1386 | void | 1386 | void |
1387 | fatal(const char *fmt,...) | 1387 | cleanup_exit(int i) |
1388 | { | 1388 | { |
1389 | va_list args; | ||
1390 | |||
1391 | va_start(args, fmt); | ||
1392 | do_log(SYSLOG_LEVEL_FATAL, fmt, args); | ||
1393 | va_end(args); | ||
1394 | leave_raw_mode(); | 1389 | leave_raw_mode(); |
1395 | leave_non_blocking(); | 1390 | leave_non_blocking(); |
1396 | _exit(255); | 1391 | _exit(i); |
1397 | } | 1392 | } |