- djm@cvs.openbsd.org 2004/07/21 10:33:31

     [auth1.c auth2.c]
     bz#899: Don't display invalid usernames in setproctitle

diff --git a/ChangeLog b/ChangeLog
index 5dbc7c242909608dc59f997b0afedb673a6a104b..589e3a0724e8ce537d7aa85c55a64b885653a09b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
      [auth.c]
      s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
      miod, ...
+   - djm@cvs.openbsd.org 2004/07/21 10:33:31
+     [auth1.c auth2.c]
+     bz#899: Don't display invalid usernames in setproctitle
 
 20040720
  - (djm) [log.c] bz #111: Escape more control characters when sending data 

diff --git a/auth1.c b/auth1.c
index ab6fd34dd90f536ed645d89ec9d8941725830b04..ea133b0cbe32a0e5f15a1c47ae203dc610116b3c 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.57 2004/05/23 23:59:53 dtucker Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.58 2004/07/21 10:33:31 djm Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -306,7 +306,7 @@ do_authentication(Authctxt *authctxt)
                authctxt->pw = fakepw();
        }
 
-       setproctitle("%s%s", authctxt->pw ? user : "unknown",
+       setproctitle("%s%s", authctxt->valid ? user : "unknown",
            use_privsep ? " [net]" : "");
 
 #ifdef USE_PAM

diff --git a/auth2.c b/auth2.c
index e4a3cded9ae530dbcc00654f5890dec044c4dc7a..a8c8bd283c2669fbb7e71d341382c479285fc7d3 100644 (file)
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.105 2004/05/23 23:59:53 dtucker Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.106 2004/07/21 10:33:31 djm Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -166,7 +166,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
                                PRIVSEP(start_pam(authctxt));
 #endif
                }
-               setproctitle("%s%s", authctxt->pw ? user : "unknown",
+               setproctitle("%s%s", authctxt->valid ? user : "unknown",
                    use_privsep ? " [net]" : "");
                authctxt->service = xstrdup(service);
                authctxt->style = style ? xstrdup(style) : NULL;