summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth1.c4
-rw-r--r--auth2.c4
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 554a6ab91..711c4c289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [auth.c] 4 [auth.c]
5 s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, 5 s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
6 miod, ... 6 miod, ...
7 - djm@cvs.openbsd.org 2004/07/21 10:33:31
8 [auth1.c auth2.c]
9 bz#899: Don't display invalid usernames in setproctitle
7 10
820040720 1120040720
9 - (djm) [log.c] bz #111: Escape more control characters when sending data 12 - (djm) [log.c] bz #111: Escape more control characters when sending data
@@ -1550,4 +1553,4 @@
1550 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1553 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1551 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1554 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1552 1555
1553$Id: ChangeLog,v 1.3484 2004/07/21 10:48:24 djm Exp $ 1556$Id: ChangeLog,v 1.3485 2004/07/21 10:48:53 djm Exp $
diff --git a/auth1.c b/auth1.c
index ab6fd34dd..ea133b0cb 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: auth1.c,v 1.57 2004/05/23 23:59:53 dtucker Exp $"); 13RCSID("$OpenBSD: auth1.c,v 1.58 2004/07/21 10:33:31 djm Exp $");
14 14
15#include "xmalloc.h" 15#include "xmalloc.h"
16#include "rsa.h" 16#include "rsa.h"
@@ -306,7 +306,7 @@ do_authentication(Authctxt *authctxt)
306 authctxt->pw = fakepw(); 306 authctxt->pw = fakepw();
307 } 307 }
308 308
309 setproctitle("%s%s", authctxt->pw ? user : "unknown", 309 setproctitle("%s%s", authctxt->valid ? user : "unknown",
310 use_privsep ? " [net]" : ""); 310 use_privsep ? " [net]" : "");
311 311
312#ifdef USE_PAM 312#ifdef USE_PAM
diff --git a/auth2.c b/auth2.c
index e4a3cded9..a8c8bd283 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.105 2004/05/23 23:59:53 dtucker Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.106 2004/07/21 10:33:31 djm Exp $");
27 27
28#include "ssh2.h" 28#include "ssh2.h"
29#include "xmalloc.h" 29#include "xmalloc.h"
@@ -166,7 +166,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
166 PRIVSEP(start_pam(authctxt)); 166 PRIVSEP(start_pam(authctxt));
167#endif 167#endif
168 } 168 }
169 setproctitle("%s%s", authctxt->pw ? user : "unknown", 169 setproctitle("%s%s", authctxt->valid ? user : "unknown",
170 use_privsep ? " [net]" : ""); 170 use_privsep ? " [net]" : "");
171 authctxt->service = xstrdup(service); 171 authctxt->service = xstrdup(service);
172 authctxt->style = style ? xstrdup(style) : NULL; 172 authctxt->style = style ? xstrdup(style) : NULL;