- (dtucker) [auth-pam.c] Tidy up PAM debugging. ok djm@

diff --git a/ChangeLog b/ChangeLog
index 93aa4381cd0a45001ef4d2b8f2142dededbe7db8..e695dc60f27d7f0955702071ba2141bcae6b07a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
      switch to license.template for code written by me (belated, I know...)
  - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from 
    stadal@suse.cz and simon@sxw.org.uk
+ - (dtucker) [auth-pam.c] Tidy up PAM debugging.  ok djm@
 
 20040212
  - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]

diff --git a/auth-pam.c b/auth-pam.c
index db72c642dea9337e94336bb1c6cb4f0d1c35bb2b..27aacedc3d90fcb0445e175425a0591ff21a5a22 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -242,7 +242,7 @@ sshpam_thread_conv(int n, const struct pam_message **msg,
        struct pam_response *reply;
        int i;
 
-       debug3("PAM: %s entering, %d responses", __func__, n);
+       debug3("PAM: %s entering, %d messages", __func__, n);
        *resp = NULL;
 
        ctxt = data;
@@ -416,7 +416,7 @@ static int
 sshpam_null_conv(int n, const struct pam_message **msg,
     struct pam_response **resp, void *data)
 {
-       debug3("PAM: %s entering, %d responses", __func__, n);
+       debug3("PAM: %s entering, %d messages", __func__, n);
        return (PAM_CONV_ERR);
 }
 
@@ -754,6 +754,8 @@ pam_tty_conv(int n, const struct pam_message **msg,
        struct pam_response *reply;
        int i;
 
+       debug3("PAM: %s called with %d messages", __func__, n);
+
        *resp = NULL;
 
        if (n <= 0 || n > PAM_MAX_NUM_MSG || !isatty(STDIN_FILENO))