- (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid

   usernames in setproctitle from peak AT argo.troja.mff.cuni.cz;

diff --git a/ChangeLog b/ChangeLog
index ee9c4a0799172c5f9bf696349510e05bf269f6bb..d2eadea590374cdc63907ffc4ba2fc675c182bd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
    - djm@cvs.openbsd.org 2004/07/21 10:36:23
      [gss-serv-krb5.c]
      fix function declaration
+ - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid 
+   usernames in setproctitle from peak AT argo.troja.mff.cuni.cz;
 
 20040720
  - (djm) [log.c] bz #111: Escape more control characters when sending data 

diff --git a/auth-pam.c b/auth-pam.c
index f928494336d6300772621ab97f67705ff5821b99..115ef6ad9f55d912b238107bde2f57af936fc2c9 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -365,8 +365,12 @@ sshpam_thread(void *ctxtp)
        const char *pam_user;
 
        pam_get_item(sshpam_handle, PAM_USER, (void **)&pam_user);
-       setproctitle("%s [pam]", pam_user);
        environ[0] = NULL;
+
+       if (sshpam_authctxt != NULL) {
+               setproctitle("%s [pam]",
+                   sshpam_authctxt->valid ? pam_user : "unknown");
+       }
 #endif
 
        sshpam_conv.conv = sshpam_thread_conv;