summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/auth1.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2003-09-23 20:17:11 +0000
committermarkus <markus@openbsd.org>2003-09-23 20:17:11 +0000
commitb8b8936d994927e3a0afdbb493b901039038a5d1 (patch)
treecb294d035132ecd2afeb1ba6a2bf6281efd34944 /usr.bin/ssh/auth1.c
parentsimplify by using getifaddrs. cedric@ ok (diff)
downloadwireguard-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/auth1.c')
-rw-r--r--usr.bin/ssh/auth1.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/ssh/auth1.c b/usr.bin/ssh/auth1.c
index 6554afbfa70..63b1609496d 100644
--- a/usr.bin/ssh/auth1.c
+++ b/usr.bin/ssh/auth1.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.52 2003/08/28 12:54:34 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.53 2003/09/23 20:17:11 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -235,10 +235,9 @@ do_authloop(Authctxt *authctxt)
* Performs authentication of an incoming connection. Session key has already
* been exchanged and encryption is enabled.
*/
-Authctxt *
-do_authentication(void)
+void
+do_authentication(Authctxt *authctxt)
{
- Authctxt *authctxt;
u_int ulen;
char *user, *style = NULL;
@@ -252,7 +251,6 @@ do_authentication(void)
if ((style = strchr(user, ':')) != NULL)
*style++ = '\0';
- authctxt = authctxt_new();
authctxt->user = user;
authctxt->style = style;
@@ -285,6 +283,4 @@ do_authentication(void)
packet_start(SSH_SMSG_SUCCESS);
packet_send();
packet_write_wait();
-
- return (authctxt);
}