Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2005-11-07  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_unix/pam_unix_passwd.c (_unix_verify_shadow): Use
        correct variable names.


And adjust .cvsignore files for libtool generated files.

37 files changed, 155 insertions, 47 deletions

diff --git a/modules/pam_access/.cvsignore b/modules/pam_access/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_access/.cvsignore
+++ b/modules/pam_access/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_cracklib/.cvsignore b/modules/pam_cracklib/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_cracklib/.cvsignore
+++ b/modules/pam_cracklib/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_debug/.cvsignore b/modules/pam_debug/.cvsignore
index ed4eaf3b..9fb98574 100644
--- a/modules/pam_debug/.cvsignore
+++ b/modules/pam_debug/.cvsignore
@@ -1,4 +1,6 @@
-dynamic
-static
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_deny/.cvsignore b/modules/pam_deny/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_deny/.cvsignore
+++ b/modules/pam_deny/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_echo/.cvsignore b/modules/pam_echo/.cvsignore
index 282522db..9fb98574 100644
--- a/modules/pam_echo/.cvsignore
+++ b/modules/pam_echo/.cvsignore
@@ -1,2 +1,6 @@
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_env/.cvsignore b/modules/pam_env/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_env/.cvsignore
+++ b/modules/pam_env/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_filter/.cvsignore b/modules/pam_filter/.cvsignore
index 9255c987..621f79ca 100644
--- a/modules/pam_filter/.cvsignore
+++ b/modules/pam_filter/.cvsignore
@@ -1,4 +1,7 @@
-dynamic
-security
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
+security
diff --git a/modules/pam_filter/upperLOWER/.cvsignore b/modules/pam_filter/upperLOWER/.cvsignore
index 9459dbe2..ceceb1b9 100644
--- a/modules/pam_filter/upperLOWER/.cvsignore
+++ b/modules/pam_filter/upperLOWER/.cvsignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 upperLOWER
 Makefile
 Makefile.in
diff --git a/modules/pam_ftp/.cvsignore b/modules/pam_ftp/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_ftp/.cvsignore
+++ b/modules/pam_ftp/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_group/.cvsignore b/modules/pam_group/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_group/.cvsignore
+++ b/modules/pam_group/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_issue/.cvsignore b/modules/pam_issue/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_issue/.cvsignore
+++ b/modules/pam_issue/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_lastlog/.cvsignore b/modules/pam_lastlog/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_lastlog/.cvsignore
+++ b/modules/pam_lastlog/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_limits/.cvsignore b/modules/pam_limits/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_limits/.cvsignore
+++ b/modules/pam_limits/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_listfile/.cvsignore b/modules/pam_listfile/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_listfile/.cvsignore
+++ b/modules/pam_listfile/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_localuser/.cvsignore b/modules/pam_localuser/.cvsignore
index 84400fdd..621104aa 100644
--- a/modules/pam_localuser/.cvsignore
+++ b/modules/pam_localuser/.cvsignore
@@ -1,5 +1,8 @@
+*.la
+*.lo
 *.so
 *~
-*.la
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_mail/.cvsignore b/modules/pam_mail/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_mail/.cvsignore
+++ b/modules/pam_mail/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_mkhomedir/.cvsignore b/modules/pam_mkhomedir/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_mkhomedir/.cvsignore
+++ b/modules/pam_mkhomedir/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_motd/.cvsignore b/modules/pam_motd/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_motd/.cvsignore
+++ b/modules/pam_motd/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_nologin/.cvsignore b/modules/pam_nologin/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_nologin/.cvsignore
+++ b/modules/pam_nologin/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_permit/.cvsignore b/modules/pam_permit/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_permit/.cvsignore
+++ b/modules/pam_permit/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_pwdb/.cvsignore b/modules/pam_pwdb/.cvsignore
index f9e10e18..0d5e633b 100644
--- a/modules/pam_pwdb/.cvsignore
+++ b/modules/pam_pwdb/.cvsignore
@@ -1,4 +1,7 @@
-dynamic
-pwdb_chkpwd
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
+pwdb_chkpwd
diff --git a/modules/pam_rhosts/.cvsignore b/modules/pam_rhosts/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_rhosts/.cvsignore
+++ b/modules/pam_rhosts/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_rootok/.cvsignore b/modules/pam_rootok/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_rootok/.cvsignore
+++ b/modules/pam_rootok/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_securetty/.cvsignore b/modules/pam_securetty/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_securetty/.cvsignore
+++ b/modules/pam_securetty/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_selinux/.cvsignore b/modules/pam_selinux/.cvsignore
index 84400fdd..621104aa 100644
--- a/modules/pam_selinux/.cvsignore
+++ b/modules/pam_selinux/.cvsignore
@@ -1,5 +1,8 @@
+*.la
+*.lo
 *.so
 *~
-*.la
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_shells/.cvsignore b/modules/pam_shells/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_shells/.cvsignore
+++ b/modules/pam_shells/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_stress/.cvsignore b/modules/pam_stress/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_stress/.cvsignore
+++ b/modules/pam_stress/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_succeed_if/.cvsignore b/modules/pam_succeed_if/.cvsignore
index 84400fdd..621104aa 100644
--- a/modules/pam_succeed_if/.cvsignore
+++ b/modules/pam_succeed_if/.cvsignore
@@ -1,5 +1,8 @@
+*.la
+*.lo
 *.so
 *~
-*.la
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_tally/.cvsignore b/modules/pam_tally/.cvsignore
index 092d1253..e5f2d30a 100644
--- a/modules/pam_tally/.cvsignore
+++ b/modules/pam_tally/.cvsignore
@@ -1,4 +1,7 @@
-dynamic
-pam_tally
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
+pam_tally
diff --git a/modules/pam_time/.cvsignore b/modules/pam_time/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_time/.cvsignore
+++ b/modules/pam_time/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_umask/.cvsignore b/modules/pam_umask/.cvsignore
index 84400fdd..621104aa 100644
--- a/modules/pam_umask/.cvsignore
+++ b/modules/pam_umask/.cvsignore
@@ -1,5 +1,8 @@
+*.la
+*.lo
 *.so
 *~
-*.la
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_unix/.cvsignore b/modules/pam_unix/.cvsignore
index 699aea32..8de09aa5 100644
--- a/modules/pam_unix/.cvsignore
+++ b/modules/pam_unix/.cvsignore
@@ -1,6 +1,9 @@
-dynamic
-unix_chkpwd
+*.la
+*.lo
 *.so
-*~
+.deps
+.libs
 Makefile
 Makefile.in
+bigcrypt
+unix_chkpwd
diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index f433ab2c..09988816 100644
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -923,11 +923,11 @@ static int _unix_verify_shadow(pam_handle_t *pamh, const char *user, unsigned in
 		if (off(UNIX__IAMROOT, ctrl)) {
 			/* Get the current number of days since 1970 */
 			curdays = time(NULL) / (60 * 60 * 24);
-			if (curdays < spent->sp_lstchg) {
+			if (curdays < spwdent->sp_lstchg) {
 				pam_syslog(pamh, LOG_DEBUG,
 					"account %s has password changed in future",
-					uname);
-				curdays = spent->sp_lstchg;
+					user);
+				curdays = spwdent->sp_lstchg;
 			}
 			if ((curdays - spwdent->sp_lstchg < spwdent->sp_min)
 				 && (spwdent->sp_min != -1))
@@ -935,9 +935,10 @@ static int _unix_verify_shadow(pam_handle_t *pamh, const char *user, unsigned in
 				 * The last password change was too recent.
 				 */
 				retval = PAM_AUTHTOK_ERR;
-			else if ((curdays - spent->sp_lstchg > spent->sp_max)
-				 && (curdays - spent->sp_lstchg > spent->sp_inact)
-				 && (curdays - spent->sp_lstchg > spent->sp_max + spent->sp_inact)
+			else if ((curdays - spwdent->sp_lstchg > spwdent->sp_max)
+				 && (curdays - spwdent->sp_lstchg > spwdent->sp_inact)
+				 && (curdays - spwdent->sp_lstchg >
+				     spwdent->sp_max + spwdent->sp_inact)
 				 && (spwdent->sp_max != -1) && (spwdent->sp_inact != -1)
 				 && (spwdent->sp_lstchg != 0))
 				/*
@@ -1366,7 +1367,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 		_pam_delete(tpass);
 		pass_old = pass_new = NULL;
 	} else {		/* something has broken with the module */
-		pam_syslog(pamh, LOG_ALERT, 
+		pam_syslog(pamh, LOG_ALERT,
 		         "password received unknown request");
 		retval = PAM_ABORT;
 	}
diff --git a/modules/pam_userdb/.cvsignore b/modules/pam_userdb/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_userdb/.cvsignore
+++ b/modules/pam_userdb/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_warn/.cvsignore b/modules/pam_warn/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_warn/.cvsignore
+++ b/modules/pam_warn/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_wheel/.cvsignore b/modules/pam_wheel/.cvsignore
index 7361e6d2..9fb98574 100644
--- a/modules/pam_wheel/.cvsignore
+++ b/modules/pam_wheel/.cvsignore
@@ -1,3 +1,6 @@
-dynamic
+*.la
+*.lo
+.deps
+.libs
 Makefile
 Makefile.in
diff --git a/modules/pam_xauth/.cvsignore b/modules/pam_xauth/.cvsignore
index 84400fdd..621104aa 100644
--- a/modules/pam_xauth/.cvsignore
+++ b/modules/pam_xauth/.cvsignore
@@ -1,5 +1,8 @@
+*.la
+*.lo
 *.so
 *~
-*.la
+.deps
+.libs
 Makefile
 Makefile.in