[Pkg-shadow-commits] r2650 - in upstream/trunk: . lib libmisc src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-11 18:37:08 +0000 (Sat, 11 Apr 2009)
New Revision: 2650

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/prototypes.h
   upstream/trunk/libmisc/age.c
   upstream/trunk/src/expiry.c
   upstream/trunk/src/login.c
Log:
	* 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.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-11 16:52:45 UTC (rev 2649)
+++ upstream/trunk/ChangeLog	2009-04-11 18:37:08 UTC (rev 2650)
@@ -1,5 +1,11 @@
 2009-04-11  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
 	if Zflg is set.
 	* src/userdel.c: Rename argv to args to avoid nameclash with the

Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2009-04-11 16:52:45 UTC (rev 2649)
+++ upstream/trunk/lib/prototypes.h	2009-04-11 18:37:08 UTC (rev 2650)
@@ -65,7 +65,7 @@
 #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 *);
 

Modified: upstream/trunk/libmisc/age.c
===================================================================
--- upstream/trunk/libmisc/age.c	2009-04-11 16:52:45 UTC (rev 2649)
+++ upstream/trunk/libmisc/age.c	2009-04-11 18:37:08 UTC (rev 2650)
@@ -160,7 +160,7 @@
  *	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;

Modified: upstream/trunk/src/expiry.c
===================================================================
--- upstream/trunk/src/expiry.c	2009-04-11 16:52:45 UTC (rev 2649)
+++ upstream/trunk/src/expiry.c	2009-04-11 18:37:08 UTC (rev 2650)
@@ -127,7 +127,7 @@
 		/*
 		 * Print out number of days until expiration.
 		 */
-		agecheck (pwd, spwd);
+		agecheck (spwd);
 
 		/*
 		 * Exit with status indicating state of account.

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2009-04-11 16:52:45 UTC (rev 2649)
+++ upstream/trunk/src/login.c	2009-04-11 18:37:08 UTC (rev 2650)
@@ -427,8 +427,10 @@
 	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 @@
 #endif
 			printf (".\n");
 		}
-		agecheck (&pwent, spwd);
+		agecheck (spwd);
 
 		mailcheck ();	/* report on the status of mail */
 #endif				/* !USE_PAM */