diff options
| author |   markus <markus@openbsd.org> | 2003-09-23 20:17:11 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-09-23 20:17:11 +0000 |
| commit | b8b8936d994927e3a0afdbb493b901039038a5d1 (patch) | |
| tree | cb294d035132ecd2afeb1ba6a2bf6281efd34944 /usr.bin/ssh/gss-serv.c | |
| parent | simplify by using getifaddrs. cedric@ ok (diff) | |
| download | wireguard-openbsd-b8b8936d994927e3a0afdbb493b901039038a5d1.tar.xz wireguard-openbsd-b8b8936d994927e3a0afdbb493b901039038a5d1.zip | |
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/gss-serv.c')
| -rw-r--r-- | usr.bin/ssh/gss-serv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/gss-serv.c b/usr.bin/ssh/gss-serv.c index 8fd1d63f03a..6574f9750b4 100644 --- a/usr.bin/ssh/gss-serv.c +++ b/usr.bin/ssh/gss-serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-serv.c,v 1.3 2003/08/31 13:31:57 markus Exp $ */ +/* $OpenBSD: gss-serv.c,v 1.4 2003/09/23 20:17:11 markus Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -232,9 +232,9 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) return (ctx->major); } -/* As user - called through fatal cleanup hook */ +/* As user - called on fatal/exit */ void -ssh_gssapi_cleanup_creds(void *ignored) +ssh_gssapi_cleanup_creds(void) { if (gssapi_client.store.filename != NULL) { /* Unlink probably isn't sufficient */ @@ -249,8 +249,6 @@ ssh_gssapi_storecreds(void) { if (gssapi_client.mech && gssapi_client.mech->storecreds) { (*gssapi_client.mech->storecreds)(&gssapi_client); - if (options.gss_cleanup_creds) - fatal_add_cleanup(ssh_gssapi_cleanup_creds, NULL); } else debug("ssh_gssapi_storecreds: Not a GSSAPI mechanism"); } |