From c1ba31fadc1146ed56bf33ae0fca2cfe1f1b9f94 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 15 Feb 2001 03:14:11 +0000 Subject: - markus@cvs.openssh.org 2001/02/13 22:49:40 [auth1.c auth2.c] setproctitle(user) only if getpwnam succeeds --- ChangeLog | 5 ++++- auth1.c | 6 +++--- auth2.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ffe51708..4827a8a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 $ diff --git a/auth1.c b/auth1.c index 2649924fd..11c56a519 100644 --- a/auth1.c +++ b/auth1.c @@ -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); diff --git a/auth2.c b/auth2.c index 3cd946877..0a627bf80 100644 --- a/auth2.c +++ b/auth2.c @@ -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 @@ -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 */ -- cgit v1.2.3