- 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 554a6ab..711c4c2 100644
--- 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
@@ -1550,4 +1553,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3484 2004/07/21 10:48:24 djm Exp $
+$Id: ChangeLog,v 1.3485 2004/07/21 10:48:53 djm Exp $
diff --git a/auth1.c b/auth1.c
index ab6fd34..ea133b0 100644
--- 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 @@
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 e4a3cde..a8c8bd2 100644
--- 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 @@
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;