* lib/prototypes.h, libmisc/age.c, src/expiry.c, src/login.c: A

	shadow entry is now sufficient for agecheck. Remove the first
	passwd entry parameter.

diff --git a/ChangeLog b/ChangeLog
index 0cd52ba3bcdebc95126331a765d63b24789a70fe..72c846c3c4104ca40b538931b3abba1bdfe9eccc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-11  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/prototypes.h, libmisc/age.c, src/expiry.c, src/login.c: A
+       shadow entry is now sufficient for agecheck. Remove the first
+       passwd entry parameter.
+
 2009-04-11  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/useradd.c, src/usermod.c: Only call selinux_update_mapping()

diff --git a/lib/prototypes.h b/lib/prototypes.h
index f5528a46f77ebc45d56fb5e938f231134afcc46f..1145ff46e2cbfa8665666297fa143e29a3842da7 100644 (file)
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -65,7 +65,7 @@ extern int add_groups (const char *);
 #endif
 
 /* age.c */
-extern void agecheck (const struct passwd *, const struct spwd *);
+extern void agecheck (const struct spwd *);
 extern int expire (const struct passwd *, const struct spwd *);
 extern int isexpired (const struct passwd *, const struct spwd *);
 

diff --git a/libmisc/age.c b/libmisc/age.c
index de69ae307bb5cbdf3d0bfa3c900df035825adc29..f9695926b539a8376d5d010940bcc39c45229f5c 100644 (file)
--- a/libmisc/age.c
+++ b/libmisc/age.c
@@ -160,7 +160,7 @@ int expire (const struct passwd *pw, const struct spwd *sp)
  *     to expire and warns the user of the pending password expiration.
  */
 
-void agecheck (const struct passwd *pw, const struct spwd *sp)
+void agecheck (const struct spwd *sp)
 {
        long now = (long) time ((time_t *) 0) / SCALE;
        long remain;

diff --git a/src/expiry.c b/src/expiry.c
index 32bb508e40aa99f878defce36cf9f0697ed0ef1f..c284d7c089d778f25e723cf4dd95b9ec55ac10ab 100644 (file)
--- a/src/expiry.c
+++ b/src/expiry.c
@@ -127,7 +127,7 @@ int main (int argc, char **argv)
                /*
                 * Print out number of days until expiration.
                 */
-               agecheck (pwd, spwd);
+               agecheck (spwd);
 
                /*
                 * Exit with status indicating state of account.

diff --git a/src/login.c b/src/login.c
index e4eb37e97c430ed76b543871ee87e939c8c8f982..081aecc4c654f2a57998d9e82507721982f06a41 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -427,8 +427,10 @@ int main (int argc, char **argv)
        char fromhost[512];
        struct passwd *pwd;
        char **envp = environ;
+#ifndef
        static char temp_pw[2];
        static char temp_shell[] = "/bin/sh";
+#endif
 
 #ifdef USE_PAM
        int retcode;
@@ -1200,7 +1202,7 @@ int main (int argc, char **argv)
 #endif
                        printf (".\n");
                }
-               agecheck (&pwent, spwd);
+               agecheck (spwd);
 
                mailcheck ();   /* report on the status of mail */
 #endif                         /* !USE_PAM */