summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2002-07-28 20:24:07 +0000
committerKevin Steves <stevesk@pobox.com>2002-07-28 20:24:07 +0000
commit6a998ebfa96c93994e9d98cd07f228de95d71a67 (patch)
tree9a4c7872f000d8f9b666cc8bd4df72b562c1cf9c
parenta7609f548f2e0be63abe740d7dbdd7d8a4a17eeb (diff)
- (stevesk) [auth-pam.c] should use PAM_MSG_MEMBER(); from solar
-rw-r--r--ChangeLog5
-rw-r--r--auth-pam.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f787ee406..0cc6459df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120020728
2 - (stevesk) [auth-pam.c] should use PAM_MSG_MEMBER(); from solar
3
120020725 420020725
2 - (djm) Remove some cruft from INSTALL 5 - (djm) Remove some cruft from INSTALL
3 - (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/ 6 - (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/
@@ -1456,4 +1459,4 @@
1456 - (stevesk) entropy.c: typo in debug message 1459 - (stevesk) entropy.c: typo in debug message
1457 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1460 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1458 1461
1459$Id: ChangeLog,v 1.2405 2002/07/25 04:40:22 djm Exp $ 1462$Id: ChangeLog,v 1.2406 2002/07/28 20:24:07 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 39c2ac6a3..99b03f45b 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -38,7 +38,7 @@ extern char *__progname;
38 38
39extern int use_privsep; 39extern int use_privsep;
40 40
41RCSID("$Id: auth-pam.c,v 1.53 2002/07/23 00:51:53 stevesk Exp $"); 41RCSID("$Id: auth-pam.c,v 1.54 2002/07/28 20:24:08 stevesk Exp $");
42 42
43#define NEW_AUTHTOK_MSG \ 43#define NEW_AUTHTOK_MSG \
44 "Warning: Your password has expired, please change it now." 44 "Warning: Your password has expired, please change it now."
@@ -156,7 +156,7 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
156 break; 156 break;
157 case PAM_ERROR_MSG: 157 case PAM_ERROR_MSG:
158 case PAM_TEXT_INFO: 158 case PAM_TEXT_INFO:
159 if ((*msg)[count].msg != NULL) 159 if (PAM_MSG_MEMBER(msg, count, msg) != NULL)
160 fprintf(stderr, "%s\n", 160 fprintf(stderr, "%s\n",
161 PAM_MSG_MEMBER(msg, count, msg)); 161 PAM_MSG_MEMBER(msg, count, msg));
162 reply[count].resp = xstrdup(""); 162 reply[count].resp = xstrdup("");