- djm@cvs.openbsd.org 2004/07/21 10:33:31
[auth1.c auth2.c] bz#899: Don't display invalid usernames in setproctitle
This commit is contained in:
parent
a22f2d761b
commit
30d1f84911
|
@ -4,6 +4,9 @@
|
||||||
[auth.c]
|
[auth.c]
|
||||||
s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
|
s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
|
||||||
miod, ...
|
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
|
20040720
|
||||||
- (djm) [log.c] bz #111: Escape more control characters when sending data
|
- (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) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (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 $
|
||||||
|
|
4
auth1.c
4
auth1.c
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "xmalloc.h"
|
||||||
#include "rsa.h"
|
#include "rsa.h"
|
||||||
|
@ -306,7 +306,7 @@ do_authentication(Authctxt *authctxt)
|
||||||
authctxt->pw = fakepw();
|
authctxt->pw = fakepw();
|
||||||
}
|
}
|
||||||
|
|
||||||
setproctitle("%s%s", authctxt->pw ? user : "unknown",
|
setproctitle("%s%s", authctxt->valid ? user : "unknown",
|
||||||
use_privsep ? " [net]" : "");
|
use_privsep ? " [net]" : "");
|
||||||
|
|
||||||
#ifdef USE_PAM
|
#ifdef USE_PAM
|
||||||
|
|
4
auth2.c
4
auth2.c
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "ssh2.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
@ -166,7 +166,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
|
||||||
PRIVSEP(start_pam(authctxt));
|
PRIVSEP(start_pam(authctxt));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
setproctitle("%s%s", authctxt->pw ? user : "unknown",
|
setproctitle("%s%s", authctxt->valid ? user : "unknown",
|
||||||
use_privsep ? " [net]" : "");
|
use_privsep ? " [net]" : "");
|
||||||
authctxt->service = xstrdup(service);
|
authctxt->service = xstrdup(service);
|
||||||
authctxt->style = style ? xstrdup(style) : NULL;
|
authctxt->style = style ? xstrdup(style) : NULL;
|
||||||
|
|
Loading…
Reference in New Issue