From ba53b839d30de74c994b8c6a20360967cb844ade Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 17 Feb 2004 20:46:59 +1100 Subject: [PATCH] - (dtucker) [auth-pam.c] Tidy up PAM debugging. ok djm@ --- ChangeLog | 3 ++- auth-pam.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1497e6532..2bb226cab 100644 --- 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] @@ -1862,4 +1863,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3231 2004/02/17 09:33:52 djm Exp $ +$Id: ChangeLog,v 1.3232 2004/02/17 09:46:59 dtucker Exp $ diff --git a/auth-pam.c b/auth-pam.c index 562fb01f2..0ab5554a3 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -31,7 +31,7 @@ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ #include "includes.h" -RCSID("$Id: auth-pam.c,v 1.93 2004/02/10 02:23:29 dtucker Exp $"); +RCSID("$Id: auth-pam.c,v 1.94 2004/02/17 09:46:59 dtucker Exp $"); #ifdef USE_PAM #if defined(HAVE_SECURITY_PAM_APPL_H) @@ -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))