diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-09-23 20:17:12 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-09-23 20:17:12 +0000 |
| commit | 2a189bfd0a5929ead66912f07789b8181460ec6c (patch) | |
| tree | fb3806b30b6f7d9302a25f51952668806252810d /usr.bin/ssh/ssh-agent.c | |
| parent | 9c3c6364fdfeaa9e90ff68eab3b3b7d230517bbf (diff) | |
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 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 542ac9e0ba2..1594c0fcb3a 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -35,7 +35,7 @@ #include "includes.h" #include <sys/queue.h> -RCSID("$OpenBSD: ssh-agent.c,v 1.113 2003/09/19 11:29:40 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.114 2003/09/23 20:17:11 markus Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -953,7 +953,7 @@ cleanup_socket(void) rmdir(socket_dir); } -static void +void cleanup_exit(int i) { cleanup_socket(); @@ -967,17 +967,6 @@ cleanup_handler(int sig) _exit(2); } -void -fatal(const char *fmt,...) -{ - va_list args; - va_start(args, fmt); - do_log(SYSLOG_LEVEL_FATAL, fmt, args); - va_end(args); - cleanup_socket(); - _exit(255); -} - static void check_parent_exists(int sig) { |