lib/, man/, src/: Remove support for 'sp_lstchg'

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

lib/age.c

@@ -133,50 +133,3 @@ int expire (const struct passwd *pw, /*@null@*/const struct spwd *sp)
 
 	exit (EXIT_FAILURE);
  /*@notreached@*/}
-
-/*
- * agecheck - see if warning is needed for password expiration
- *
- *	agecheck sees how many days until the user's password is going
- *	to expire and warns the user of the pending password expiration.
- */
-
-void agecheck (/*@null@*/const struct spwd *sp)
-{
-	long now = time(NULL) / DAY;
-	long remain;
-
-	if (NULL == sp) {
-		return;
-	}
-
-	/*
-	 * The last, max, and warn fields must be supported or the
-	 * warning period cannot be calculated.
-	 */
-
-	if (   (-1 == sp->sp_lstchg)
-	    || (-1 == sp->sp_max)
-	    || (-1 == sp->sp_warn)) {
-		return;
-	}
-
-	if (0 == sp->sp_lstchg) {
-		(void) puts (_("You must change your password."));
-		return;
-	}
-
-	remain = addsl(sp->sp_lstchg, sp->sp_max, -now);
-
-	if (remain <= sp->sp_warn) {
-		if (remain > 1) {
-			(void) printf (_("Your password will expire in %ld days.\n"),
-			               remain);
-		} else if (1 == remain) {
-			(void) puts (_("Your password will expire tomorrow."));
-		} else if (remain == 0) {
-			(void) puts (_("Your password will expire today."));
-		}
-	}
-}
-

lib/prototypes.h

@@ -43,7 +43,6 @@ extern int add_groups (const char *);
 #endif
 
 /* age.c */
-extern void agecheck (/*@null@*/const struct spwd *);
 extern int expire (const struct passwd *, /*@null@*/const struct spwd *);
 
 /* isexpired.c */

lib/shadow/shadow/sgetspent.c

@@ -65,16 +65,7 @@ sgetspent(const char *s)
 	spwd.sp_namp = fields[0];
 	spwd.sp_pwdp = fields[1];
 
-	/*
-	 * Get the last changed date.  For all of the integer fields,
-	 * we check for proper format.  It is an error to have an
-	 * incorrectly formatted number.
-	 */
-
-	if (streq(fields[2], ""))
-		spwd.sp_lstchg = -1;
-	else if (a2sl(&spwd.sp_lstchg, fields[2], NULL, 0, 0, LONG_MAX) == -1)
-		return NULL;
+	spwd.sp_lstchg = -1;
 
 	/*
 	 * Get the minimum period between password changes.

man/shadow.5.xml

@@ -104,18 +104,7 @@
 	  <emphasis role="bold">date of last password change</emphasis>
 	</term>
 	<listitem>
-	  <para>
-	    The date of the last password change, expressed as the number
-	    of days since 1970-01-01 00:00:00 UTC.
-	  </para>
-	  <para>
-	    The value 0 indicates that the user must change their password
-	    the next time they log in to the system.
-	  </para>
-	  <para>
-	    An empty field means that password aging features are
-	    disabled.
-	  </para>
+	  <para>This field should be empty.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>

src/login.c

@@ -1211,8 +1211,6 @@ int main (int argc, char **argv)
 			printf (".\n");
 		}
 #endif /* ENABLE_LASTLOG */
-		agecheck (spwd);
-
 		mailcheck ();	/* report on the status of mail */
 #endif				/* !USE_PAM */
 	} else {

src/passwd.c

@@ -418,28 +418,6 @@ static void check_password (const struct passwd *pw, const struct spwd *sp)
 		closelog ();
 		exit (E_NOPERM);
 	}
-
-	/*
-	 * Passwords may only be changed after sp_min time is up.
-	 */
-	if (sp->sp_lstchg > 0) {
-		long now, ok;
-		now = time(NULL) / DAY;
-		ok = sp->sp_lstchg;
-		if (   (sp->sp_min > 0)
-		    && __builtin_add_overflow(ok, sp->sp_min, &ok)) {
-			ok = LONG_MAX;
-		}
-
-		if (now < ok) {
-			(void) fprintf (stderr,
-			                _("The password for %s cannot be changed yet.\n"),
-			                pw->pw_name);
-			SYSLOG ((LOG_WARN, "now < minimum age for '%s'", pw->pw_name));
-			closelog ();
-			exit (E_NOPERM);
-		}
-	}
 }
 
 static /*@observer@*/const char *pw_status (const char *pass)
@@ -667,12 +645,7 @@ static void update_shadow(const struct option_flags *flags)
 	if (!use_pam)
 	{
 		if (do_update_age) {
-			nsp->sp_lstchg = gettime () / DAY;
-			if (0 == nsp->sp_lstchg) {
-				/* Better disable aging than requiring a password
-				 * change */
-				nsp->sp_lstchg = -1;
-			}
+			nsp->sp_lstchg = -1;
 		}
 	}
 

src/pwck.c

@@ -634,13 +634,7 @@ static void check_pw_file(bool *errors, bool *changed, const struct option_flags
 					sp.sp_inact  = -1;
 					sp.sp_expire = -1;
 					sp.sp_flag   = SHADOW_SP_FLAG_UNSET;
-					sp.sp_lstchg = gettime () / DAY;
-					if (0 == sp.sp_lstchg) {
-						/* Better disable aging than
-						 * requiring a password change
-						 */
-						sp.sp_lstchg = -1;
-					}
+					sp.sp_lstchg = -1;
 					*changed = true;
 
 					if (spw_update (&sp) == 0) {
@@ -833,19 +827,6 @@ static void check_spw_file (bool *errors, bool *changed)
 				goto delete_spw;
 			}
 		}
-
-		/*
-		 * Warn if last password change in the future.  --marekm
-		 */
-		if (!quiet) {
-			time_t t = time (NULL);
-			if (   (t != 0)
-			    && (spw->sp_lstchg > t / DAY)) {
-				printf (_("user %s: last password change in the future\n"),
-			                spw->sp_namp);
-				*errors = true;
-			}
-		}
 	}
 }
 

src/pwconv.c

@@ -259,12 +259,7 @@ int main (int argc, char **argv)
 			spent.sp_flag   = SHADOW_SP_FLAG_UNSET;
 		}
 		spent.sp_pwdp = pw->pw_passwd;
-		spent.sp_lstchg = gettime () / DAY;
-		if (0 == spent.sp_lstchg) {
-			/* Better disable aging than requiring a password
-			 * change */
-			spent.sp_lstchg = -1;
-		}
+		spent.sp_lstchg = -1;
 		if (spw_update (&spent) == 0) {
 			fprintf (stderr,
 			         _("%s: failed to prepare the new %s entry '%s'\n"),

src/useradd.c

@@ -957,11 +957,7 @@ static void new_spent (struct spwd *spent)
 	memzero(spent, sizeof(*spent));
 	spent->sp_namp = (char *) user_name;
 	spent->sp_pwdp = (char *) user_pass;
-	spent->sp_lstchg = gettime () / DAY;
-	if (0 == spent->sp_lstchg) {
-		/* Better disable aging than requiring a password change */
-		spent->sp_lstchg = -1;
-	}
+	spent->sp_lstchg = -1;
 	if (!rflg) {
 		spent->sp_min = getdef_num ("PASS_MIN_DAYS", -1);
 		spent->sp_max = getdef_num ("PASS_MAX_DAYS", -1);

src/usermod.c

@@ -605,12 +605,7 @@ static void new_spent (struct spwd *spent, bool process_selinux)
 	spent->sp_pwdp = new_pw_passwd (spent->sp_pwdp);
 
 	if (pflg) {
-		spent->sp_lstchg = gettime () / DAY;
-		if (0 == spent->sp_lstchg) {
-			/* Better disable aging than requiring a password
-			 * change. */
-			spent->sp_lstchg = -1;
-		}
+		spent->sp_lstchg = -1;
 	}
 }
 
@@ -1697,12 +1692,7 @@ static void usr_update(const struct option_flags *flags)
 			spent.sp_pwdp   = xstrdup (pwent.pw_passwd);
 			pwent.pw_passwd = xstrdup (SHADOW_PASSWD_STRING);
 
-			spent.sp_lstchg = gettime () / DAY;
-			if (0 == spent.sp_lstchg) {
-				/* Better disable aging than
-				 * requiring a password change */
-				spent.sp_lstchg = -1;
-			}
+			spent.sp_lstchg = -1;
 			spent.sp_min    = getdef_num ("PASS_MIN_DAYS", -1);
 			spent.sp_max    = getdef_num ("PASS_MAX_DAYS", -1);
 			spent.sp_warn   = getdef_num ("PASS_WARN_AGE", -1);