tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Darren Tucker 2004-02-17 20:46:59 +11:00
parent 34255b9f4c
commit ba53b839d3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,7 @@
switch to license.template for code written by me (belated, I know...) switch to license.template for code written by me (belated, I know...)
- (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from
stadal@suse.cz and simon@sxw.org.uk stadal@suse.cz and simon@sxw.org.uk
- (dtucker) [auth-pam.c] Tidy up PAM debugging. ok djm@
20040212 20040212
- (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh] - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

8
auth-pam.c
View File

@ -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 $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #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 #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #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; struct pam_response *reply;
int i; int i;
debug3("PAM: %s entering, %d responses", __func__, n); debug3("PAM: %s entering, %d messages", __func__, n);
*resp = NULL; *resp = NULL;
ctxt = data; ctxt = data;
@ -416,7 +416,7 @@ static int
sshpam_null_conv(int n, const struct pam_message **msg, sshpam_null_conv(int n, const struct pam_message **msg,
struct pam_response **resp, void *data) 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); return (PAM_CONV_ERR);
} }
@ -754,6 +754,8 @@ pam_tty_conv(int n, const struct pam_message **msg,
struct pam_response *reply; struct pam_response *reply;
int i; int i;
debug3("PAM: %s called with %d messages", __func__, n);
*resp = NULL; *resp = NULL;
if (n <= 0 || n > PAM_MAX_NUM_MSG || !isatty(STDIN_FILENO)) if (n <= 0 || n > PAM_MAX_NUM_MSG || !isatty(STDIN_FILENO))