diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:14:11 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:14:11 +0000 |
commit | c1ba31fadc1146ed56bf33ae0fca2cfe1f1b9f94 (patch) | |
tree | 435ba79b3fc934bf71390db76002cf357cc07624 | |
parent | f9452513fcf92be881809006ce3c210805d5f2ad (diff) | |
download | openssh-git-c1ba31fadc1146ed56bf33ae0fca2cfe1f1b9f94.tar.gz |
- markus@cvs.openssh.org 2001/02/13 22:49:40
[auth1.c auth2.c]
setproctitle(user) only if getpwnam succeeds
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth1.c | 6 | ||||
-rw-r--r-- | auth2.c | 4 |
3 files changed, 9 insertions, 6 deletions
@@ -23,6 +23,9 @@ - deraadt@cvs.openbsd.org 2001/02/12 22:56:09 [clientloop.c packet.c ssh-keyscan.c] deal with EAGAIN/EINTR selects which were skipped + - markus@cvs.openssh.org 2001/02/13 22:49:40 + [auth1.c auth2.c] + setproctitle(user) only if getpwnam succeeds 20010214 - (djm) Don't try to close PAM session or delete credentials if the @@ -3951,4 +3954,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.765 2001/02/15 03:12:08 mouring Exp $ +$Id: ChangeLog,v 1.766 2001/02/15 03:14:11 mouring Exp $ @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.16 2001/02/12 16:16:23 markus Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.17 2001/02/13 22:49:40 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -378,8 +378,6 @@ do_authentication() authctxt->user = user; authctxt->style = style; - setproctitle("%s", user); - /* Verify that the user is a valid user. */ pw = getpwnam(user); if (pw && allowed_user(pw)) { @@ -391,6 +389,8 @@ do_authentication() } authctxt->pw = pw; + setproctitle("%s", pw ? user : "unknown"); + #ifdef USE_PAM if (pw) start_pam(user); @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.41 2001/02/12 16:16:23 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.42 2001/02/13 22:49:40 markus Exp $"); #include <openssl/evp.h> @@ -189,7 +189,6 @@ input_userauth_request(int type, int plen, void *ctxt) if (authctxt->attempt++ == 0) { /* setup auth context */ struct passwd *pw = NULL; - setproctitle("%s", user); pw = getpwnam(user); if (pw && allowed_user(pw) && strcmp(service, "ssh-connection")==0) { authctxt->pw = pwcopy(pw); @@ -204,6 +203,7 @@ input_userauth_request(int type, int plen, void *ctxt) start_pam("NOUSER"); #endif } + setproctitle("%s", pw ? user : "unknown"); authctxt->user = xstrdup(user); authctxt->service = xstrdup(service); authctxt->style = style ? xstrdup(style) : NULL; /* currently unused */ |