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 /ssh-agent.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 'ssh-agent.c')
| -rw-r--r-- | ssh-agent.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 28a39a93..0fe87729 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -35,7 +35,7 @@ #include "includes.h" #include "openbsd-compat/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> @@ -957,7 +957,7 @@ cleanup_socket(void) rmdir(socket_dir); } -static void +void cleanup_exit(int i) { cleanup_socket(); @@ -971,17 +971,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) { |