summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-22 03:04:08 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-22 03:04:08 +0000
commit7ebb635d812d68772ce3fb0b64d798c54fbfab71 (patch)
tree6bf832ba30e5d9643ed75677ce9ff6155fe7e549 /auth2.c
parent6328ab39891ea64ccd5c91e9be2ec5c4f843bbd0 (diff)
- markus@cvs.openbsd.org 2002/03/19 14:27:39
[auth.c auth1.c auth2.c] make getpwnamallow() allways call pwcopy()
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/auth2.c b/auth2.c
index 9bfcde5c1..98e1eda1a 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.88 2002/03/18 17:50:31 provos Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.89 2002/03/19 14:27:39 markus Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29 29
@@ -47,7 +47,6 @@ RCSID("$OpenBSD: auth2.c,v 1.88 2002/03/18 17:50:31 provos Exp $");
47#include "pathnames.h" 47#include "pathnames.h"
48#include "uidswap.h" 48#include "uidswap.h"
49#include "auth-options.h" 49#include "auth-options.h"
50#include "misc.h"
51#include "hostfile.h" 50#include "hostfile.h"
52#include "canohost.h" 51#include "canohost.h"
53#include "match.h" 52#include "match.h"
@@ -200,16 +199,11 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
200 start_pam("NOUSER"); 199 start_pam("NOUSER");
201#endif 200#endif
202 } 201 }
203 /* Free memory */ 202 setproctitle("%s%s", authctxt->pw ? user : "unknown",
204 if (use_privsep && pw != NULL)
205 pwfree(pw);
206
207 setproctitle("%s%s", pw ? user : "unknown",
208 use_privsep ? " [net]" : ""); 203 use_privsep ? " [net]" : "");
209 authctxt->user = xstrdup(user); 204 authctxt->user = xstrdup(user);
210 authctxt->service = xstrdup(service); 205 authctxt->service = xstrdup(service);
211 authctxt->style = style ? xstrdup(style) : NULL; 206 authctxt->style = style ? xstrdup(style) : NULL;
212
213 if (use_privsep) 207 if (use_privsep)
214 mm_inform_authserv(service, style); 208 mm_inform_authserv(service, style);
215 } else if (strcmp(user, authctxt->user) != 0 || 209 } else if (strcmp(user, authctxt->user) != 0 ||