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 /auth1.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 'auth1.c')
-rw-r--r-- | auth1.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.52 2003/08/28 12:54:34 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.53 2003/09/23 20:17:11 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -275,10 +275,9 @@ do_authloop(Authctxt *authctxt) | |||
275 | * Performs authentication of an incoming connection. Session key has already | 275 | * Performs authentication of an incoming connection. Session key has already |
276 | * been exchanged and encryption is enabled. | 276 | * been exchanged and encryption is enabled. |
277 | */ | 277 | */ |
278 | Authctxt * | 278 | void |
279 | do_authentication(void) | 279 | do_authentication(Authctxt *authctxt) |
280 | { | 280 | { |
281 | Authctxt *authctxt; | ||
282 | u_int ulen; | 281 | u_int ulen; |
283 | char *user, *style = NULL; | 282 | char *user, *style = NULL; |
284 | 283 | ||
@@ -292,7 +291,6 @@ do_authentication(void) | |||
292 | if ((style = strchr(user, ':')) != NULL) | 291 | if ((style = strchr(user, ':')) != NULL) |
293 | *style++ = '\0'; | 292 | *style++ = '\0'; |
294 | 293 | ||
295 | authctxt = authctxt_new(); | ||
296 | authctxt->user = user; | 294 | authctxt->user = user; |
297 | authctxt->style = style; | 295 | authctxt->style = style; |
298 | 296 | ||
@@ -332,6 +330,4 @@ do_authentication(void) | |||
332 | packet_start(SSH_SMSG_SUCCESS); | 330 | packet_start(SSH_SMSG_SUCCESS); |
333 | packet_send(); | 331 | packet_send(); |
334 | packet_write_wait(); | 332 | packet_write_wait(); |
335 | |||
336 | return (authctxt); | ||
337 | } | 333 | } |