*: Remove support for 'sp_max'

alejandro-colomar · alejandro-colomar · commit a97598c28aab · 2025-12-16T23:08:35.000+01:00
Whenever we were reading it, let's assume it contains a -1 (the integer
representation of an empty field).  Whenever we were writing it, let's
write a -1.

Signed-off-by: Alejandro Colomar &lt;alx@kernel.org&gt;
diff --git a/lib/shadow/shadow/sgetspent.c b/lib/shadow/shadow/sgetspent.c
@@ -67,15 +67,7 @@ sgetspent(const char *s)
 
 	spwd.sp_lstchg = -1;
 	spwd.sp_min = -1;
-
-	/*
-	 * Get the maximum number of days a password is valid.
-	 */
-
-	if (streq(fields[4], ""))
-		spwd.sp_max = -1;
-	else if (a2sl(&spwd.sp_max, fields[4], NULL, 0, 0, LONG_MAX) == -1)
-		return NULL;
+	spwd.sp_max = -1;
 
 	/*
 	 * If there are only OFIELDS fields (this is a SVR3.2 /etc/shadow
diff --git a/lib/shadowmem.c b/lib/shadowmem.c
@@ -33,7 +33,7 @@
 	/* The libc might define other fields. They won't be copied. */
 	sp->sp_lstchg = -1;
 	sp->sp_min    = -1;
-	sp->sp_max    = spent->sp_max;
+	sp->sp_max    = -1;
 	sp->sp_warn   = spent->sp_warn;
 	sp->sp_inact  = spent->sp_inact;
 	sp->sp_expire = spent->sp_expire;
diff --git a/man/shadow.5.xml b/man/shadow.5.xml
@@ -116,23 +116,7 @@
       <varlistentry>
 	<term><emphasis role="bold">maximum password age</emphasis></term>
 	<listitem>
-	  <para>
-	    The maximum password age is the number of days after which the
-	    user must change their password.
-	  </para>
-	  <para>
-	    After this number of days has elapsed, the password may still be valid.
-	    The user is prompted to change their password at the next login.
-	  </para>
-	  <para>
-	    An empty field means that there are no maximum password age,
-	    no password warning period, and no password inactivity period
-	    (see below).
-	  </para>
-	  <para>
-	    If the maximum password age is lower than the minimum password
-	    age, the user cannot change her password.
-	  </para>
+	  <para>This field should be empty.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/passwd.c b/src/passwd.c
@@ -410,10 +410,9 @@ static void print_status (const struct passwd *pw)
 
 	sp = prefix_getspnam (pw->pw_name); /* local, no need for xprefix_getspnam */
 	if (NULL != sp) {
-		(void) printf ("%s %s never -1 %ld %ld %ld\n",
+		(void) printf ("%s %s never -1 -1 %ld %ld\n",
 		               pw->pw_name,
 		               pw_status (sp->sp_pwdp),
-		               sp->sp_max,
 		               sp->sp_warn,
 		               sp->sp_inact);
 	} else if (NULL != pw->pw_passwd) {
