diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -11,6 +11,8 @@ | |||
11 | - djm@cvs.openbsd.org 2004/07/21 10:36:23 | 11 | - djm@cvs.openbsd.org 2004/07/21 10:36:23 |
12 | [gss-serv-krb5.c] | 12 | [gss-serv-krb5.c] |
13 | fix function declaration | 13 | fix function declaration |
14 | - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid | ||
15 | usernames in setproctitle from peak AT argo.troja.mff.cuni.cz; | ||
14 | 16 | ||
15 | 20040720 | 17 | 20040720 |
16 | - (djm) [log.c] bz #111: Escape more control characters when sending data | 18 | - (djm) [log.c] bz #111: Escape more control characters when sending data |
@@ -1557,4 +1559,4 @@ | |||
1557 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1559 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1558 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1560 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1559 | 1561 | ||
1560 | $Id: ChangeLog,v 1.3486 2004/07/21 10:49:39 djm Exp $ | 1562 | $Id: ChangeLog,v 1.3487 2004/07/21 10:54:47 djm Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 63515c311..7d610d0bb 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
49 | #include "includes.h" | 49 | #include "includes.h" |
50 | RCSID("$Id: auth-pam.c,v 1.112 2004/07/18 23:39:11 djm Exp $"); | 50 | RCSID("$Id: auth-pam.c,v 1.113 2004/07/21 10:54:47 djm Exp $"); |
51 | 51 | ||
52 | #ifdef USE_PAM | 52 | #ifdef USE_PAM |
53 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 53 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -365,8 +365,12 @@ sshpam_thread(void *ctxtp) | |||
365 | const char *pam_user; | 365 | const char *pam_user; |
366 | 366 | ||
367 | pam_get_item(sshpam_handle, PAM_USER, (void **)&pam_user); | 367 | pam_get_item(sshpam_handle, PAM_USER, (void **)&pam_user); |
368 | setproctitle("%s [pam]", pam_user); | ||
369 | environ[0] = NULL; | 368 | environ[0] = NULL; |
369 | |||
370 | if (sshpam_authctxt != NULL) { | ||
371 | setproctitle("%s [pam]", | ||
372 | sshpam_authctxt->valid ? pam_user : "unknown"); | ||
373 | } | ||
370 | #endif | 374 | #endif |
371 | 375 | ||
372 | sshpam_conv.conv = sshpam_thread_conv; | 376 | sshpam_conv.conv = sshpam_thread_conv; |