summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-05-08 12:27:55 +1000
committerDamien Miller <djm@mindrot.org>2002-05-08 12:27:55 +1000
commitf762a4bea554a9ff4dc59b9456c7e1a2379310b3 (patch)
treeadfd0030673aa143c09ef6f29b624bc6dd9ebe42
parenta33501bb5f8a7057dc56fd49a8a40c57468d86d4 (diff)
- (djm) Don't reinitialise PAM credentials before we have started PAM.
Report from Pekka Savola <pekkas@netcore.fi>
-rw-r--r--ChangeLog6
-rw-r--r--auth-pam.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 213f6417c..72a17acdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
2 - (djm) Unbreak auth-passwd.c for PAM and SIA 2 - (djm) Unbreak auth-passwd.c for PAM and SIA
3 - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola 3 - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola
4 <pekkas@netcore.fi> 4 <pekkas@netcore.fi>
5 5 - (djm) Don't reinitialise PAM credentials before we have started PAM.
6 Report from Pekka Savola <pekkas@netcore.fi>
7
620020506 820020506
7 - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue 9 - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
8 10
@@ -533,4 +535,4 @@
533 - (stevesk) entropy.c: typo in debug message 535 - (stevesk) entropy.c: typo in debug message
534 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 536 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
535 537
536$Id: ChangeLog,v 1.2094 2002/05/08 02:24:42 djm Exp $ 538$Id: ChangeLog,v 1.2095 2002/05/08 02:27:55 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 10a87fa46..490990dec 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -36,7 +36,7 @@
36 36
37extern char *__progname; 37extern char *__progname;
38 38
39RCSID("$Id: auth-pam.c,v 1.45 2002/04/26 01:27:24 djm Exp $"); 39RCSID("$Id: auth-pam.c,v 1.46 2002/05/08 02:27:56 djm Exp $");
40 40
41#define NEW_AUTHTOK_MSG \ 41#define NEW_AUTHTOK_MSG \
42 "Warning: Your password has expired, please change it now" 42 "Warning: Your password has expired, please change it now"
@@ -299,6 +299,9 @@ void do_pam_setcred(int init)
299{ 299{
300 int pam_retval; 300 int pam_retval;
301 301
302 if (__pamh == NULL)
303 return;
304
302 do_pam_set_conv(&conv); 305 do_pam_set_conv(&conv);
303 306
304 debug("PAM establishing creds"); 307 debug("PAM establishing creds");