Skip to content

Remove support for shadow(5)'s sp_min #1482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Remove support for shadow(5)'s sp_min #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3aad759
src/chage.c: Remove interactive -m
alejandro-colomar Dec 17, 2025
f4ad422
*/: chage(1): -m,--mindays: Remove option
alejandro-colomar Dec 17, 2025
ccd00d0
*/: passwd(1): -n,--mindays: Remove option
alejandro-colomar Dec 16, 2025
d4202fd
*/: login.defs(5): PASS_MIN_DAYS: Remove configuration variable
alejandro-colomar Dec 16, 2025
f1d901d
*/: shadow(5): sp_min: Ignore field, and clear it
alejandro-colomar Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions etc/login.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,10 @@ UMASK 022
# Password aging controls:
#
# PASS_MAX_DAYS Maximum number of days a password may be used.
# PASS_MIN_DAYS Minimum number of days allowed between password changes.
# PASS_MIN_LEN Minimum acceptable password length.
# PASS_WARN_AGE Number of days warning given before a password expires.
#
PASS_MAX_DAYS 99999
PASS_MIN_DAYS 0
PASS_MIN_LEN 5
PASS_WARN_AGE 7

Expand Down
2 changes: 1 addition & 1 deletion lib/age.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ int expire (const struct passwd *pw, /*@null@*/const struct spwd *sp)
* change that password.
*/

if ((status > 1) || (sp->sp_max < sp->sp_min)) {
if (status > 1) {
(void) puts (_(" Contact the system administrator."));
exit (EXIT_FAILURE);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/pwd2spwd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct spwd *pwd_to_spwd (const struct passwd *pw)
* file. They are set to uninitialized values.
*/
sp.sp_lstchg = -1;
sp.sp_min = 0;
sp.sp_min = -1;
sp.sp_max = -1;
sp.sp_warn = -1;
sp.sp_expire = -1;
Expand Down
9 changes: 1 addition & 8 deletions lib/shadow/shadow/sgetspent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,7 @@ sgetspent(const char *s)
else if (a2sl(&spwd.sp_lstchg, fields[2], NULL, 0, 0, LONG_MAX) == -1)
return NULL;

/*
* Get the minimum period between password changes.
*/

if (streq(fields[3], ""))
spwd.sp_min = -1;
else if (a2sl(&spwd.sp_min, fields[3], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
spwd.sp_min = -1;

/*
* Get the maximum number of days a password is valid.
Expand Down
2 changes: 1 addition & 1 deletion lib/shadowmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
/* The libc might define other fields. They won't be copied. */
sp->sp_lstchg = spent->sp_lstchg;
sp->sp_min = spent->sp_min;
sp->sp_min = -1;
sp->sp_max = spent->sp_max;
sp->sp_warn = spent->sp_warn;
sp->sp_inact = spent->sp_inact;
Expand Down
1 change: 0 additions & 1 deletion man/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ login_defs_v = \
PASS_CHANGE_TRIES.xml \
PASS_MAX_DAYS.xml \
PASS_MAX_LEN.xml \
PASS_MIN_DAYS.xml \
PASS_WARN_AGE.xml \
PORTTIME_CHECKS_ENAB.xml \
QUOTAS_ENAB.xml \
Expand Down
12 changes: 0 additions & 12 deletions man/chage.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,6 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-m</option>, <option>--mindays</option>&nbsp;<replaceable>MIN_DAYS</replaceable>
</term>
<listitem>
<para>
Set the minimum number of days between password changes to
<replaceable>MIN_DAYS</replaceable>. A value of zero for this field
indicates that the user may change their password at any time.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-M</option>, <option>--maxdays</option>&nbsp;<replaceable>MAX_DAYS</replaceable>
Expand Down
12 changes: 5 additions & 7 deletions man/login.defs.5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<!ENTITY PASS_CHANGE_TRIES SYSTEM "login.defs.d/PASS_CHANGE_TRIES.xml">
<!ENTITY PASS_MAX_LEN SYSTEM "login.defs.d/PASS_MAX_LEN.xml">
<!ENTITY PASS_MAX_DAYS SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
<!ENTITY PASS_MIN_DAYS SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
<!ENTITY PASS_WARN_AGE SYSTEM "login.defs.d/PASS_WARN_AGE.xml">
<!ENTITY PORTTIME_CHECKS_ENAB SYSTEM "login.defs.d/PORTTIME_CHECKS_ENAB.xml">
<!ENTITY QUOTAS_ENAB SYSTEM "login.defs.d/QUOTAS_ENAB.xml">
Expand Down Expand Up @@ -190,10 +189,9 @@
&PASS_ALWAYS_WARN;
&PASS_CHANGE_TRIES;
&PASS_MAX_DAYS;
&PASS_MIN_DAYS;
&PASS_WARN_AGE;
<para>
<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and
<option>PASS_MAX_DAYS</option>, and
<option>PASS_WARN_AGE</option> are only used at the
time of account creation. Any changes to these settings won't affect
existing accounts.
Expand Down Expand Up @@ -388,7 +386,7 @@
GID_MAX GID_MIN
MAX_MEMBERS_PER_GROUP
HOME_MODE
PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
PASS_MAX_DAYS PASS_WARN_AGE
SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS
SUB_GID_COUNT SUB_GID_MAX SUB_GID_MIN SUB_GID_DETERMINISTIC
SUB_GID_STORE_BY_UID
Expand Down Expand Up @@ -419,7 +417,7 @@
<term>pwck</term>
<listitem>
<para>
PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
PASS_MAX_DAYS PASS_WARN_AGE
<phrase condition="tcb">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>
</para>
</listitem>
Expand All @@ -428,7 +426,7 @@
<term>pwconv</term>
<listitem>
<para>
PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
PASS_MAX_DAYS PASS_WARN_AGE
<phrase condition="tcb">USE_TCB</phrase>
</para>
</listitem>
Expand Down Expand Up @@ -476,7 +474,7 @@
HOME_MODE
LASTLOG_UID_MAX
MAIL_DIR MAX_MEMBERS_PER_GROUP
PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
PASS_MAX_DAYS PASS_WARN_AGE
SUB_GID_COUNT SUB_GID_MAX SUB_GID_MIN SUB_GID_DETERMINISTIC
SUB_GID_STORE_BY_UID
SUB_UID_COUNT SUB_UID_MAX SUB_UID_MIN SUB_UID_DETERMINISTIC
Expand Down
16 changes: 0 additions & 16 deletions man/login.defs.d/PASS_MIN_DAYS.xml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions man/newusers.8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<!ENTITY HOME_MODE SYSTEM "login.defs.d/HOME_MODE.xml">
<!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
<!ENTITY PASS_MAX_DAYS SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
<!ENTITY PASS_MIN_DAYS SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
<!ENTITY PASS_WARN_AGE SYSTEM "login.defs.d/PASS_WARN_AGE.xml">
<!ENTITY SHA_CRYPT_MIN_ROUNDS SYSTEM "login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml">
<!ENTITY SUB_GID_COUNT SYSTEM "login.defs.d/SUB_GID_COUNT.xml">
Expand Down Expand Up @@ -394,7 +393,6 @@
</variablelist>
<variablelist>
&PASS_MAX_DAYS;
&PASS_MIN_DAYS;
&PASS_WARN_AGE;
</variablelist>
<variablelist condition="no_pam">
Expand Down
12 changes: 0 additions & 12 deletions man/passwd.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,18 +236,6 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-n</option>, <option>--mindays</option>&nbsp;<replaceable>MIN_DAYS</replaceable>
</term>
<listitem>
<para>
Set the minimum number of days between password changes to
<replaceable>MIN_DAYS</replaceable>. A value of zero for this field
indicates that the user may change their password at any time.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-q</option>, <option>--quiet</option>
Expand Down
2 changes: 0 additions & 2 deletions man/pwck.8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY NONEXISTENT SYSTEM "login.defs.d/NONEXISTENT.xml">
<!ENTITY PASS_MAX_DAYS SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
<!ENTITY PASS_MIN_DAYS SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
<!ENTITY PASS_WARN_AGE SYSTEM "login.defs.d/PASS_WARN_AGE.xml">
<!ENTITY TCB_AUTH_GROUP SYSTEM "login.defs.d/TCB_AUTH_GROUP.xml">
<!ENTITY TCB_SYMLINKS SYSTEM "login.defs.d/TCB_SYMLINKS.xml">
Expand Down Expand Up @@ -247,7 +246,6 @@
<variablelist>
&NONEXISTENT;
&PASS_MAX_DAYS;
&PASS_MIN_DAYS;
&PASS_WARN_AGE;
&TCB_AUTH_GROUP;
&TCB_SYMLINKS;
Expand Down
3 changes: 0 additions & 3 deletions man/pwconv.8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
<!ENTITY PASS_MAX_DAYS SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
<!ENTITY PASS_MIN_DAYS SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
<!ENTITY PASS_WARN_AGE SYSTEM "login.defs.d/PASS_WARN_AGE.xml">
<!ENTITY USE_TCB SYSTEM "login.defs.d/USE_TCB.xml">
<!-- SHADOW-CONFIG-HERE -->
Expand Down Expand Up @@ -142,7 +141,6 @@

<para>
<command>pwconv</command> will use the values of <emphasis
remap='I'>PASS_MIN_DAYS</emphasis>, <emphasis
remap='I'>PASS_MAX_DAYS</emphasis>, and <emphasis
remap='I'>PASS_WARN_AGE</emphasis> from
<filename>/etc/login.defs</filename> when adding new entries to
Expand Down Expand Up @@ -218,7 +216,6 @@
</para>
<variablelist>
&PASS_MAX_DAYS;
&PASS_MIN_DAYS;
&PASS_WARN_AGE;
&USE_TCB;
</variablelist>
Expand Down
9 changes: 1 addition & 8 deletions man/shadow.5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,7 @@
<varlistentry>
<term><emphasis role="bold">minimum password age</emphasis></term>
<listitem>
<para>
The minimum password age is the number of days the user must wait
before they can change their password again.
</para>
<para>
An empty field and value 0 mean that there is no minimum
password age.
</para>
<para>This deprecated field should be empty, and is ignored.</para>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
2 changes: 0 additions & 2 deletions man/useradd.8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<!ENTITY MAIL_DIR SYSTEM "login.defs.d/MAIL_DIR.xml">
<!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
<!ENTITY PASS_MAX_DAYS SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
<!ENTITY PASS_MIN_DAYS SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
<!ENTITY PASS_WARN_AGE SYSTEM "login.defs.d/PASS_WARN_AGE.xml">
<!ENTITY SUB_GID_COUNT SYSTEM "login.defs.d/SUB_GID_COUNT.xml">
<!ENTITY SUB_UID_COUNT SYSTEM "login.defs.d/SUB_UID_COUNT.xml">
Expand Down Expand Up @@ -786,7 +785,6 @@
&MAIL_DIR;
&MAX_MEMBERS_PER_GROUP;
&PASS_MAX_DAYS;
&PASS_MIN_DAYS;
&PASS_WARN_AGE;
&SUB_GID_COUNT; <!-- documents also SUB_GID_MAX and SUB_GID_MIN -->
&SUB_UID_COUNT; <!-- documents also SUB_UID_MAX and SUB_UID_MIN -->
Expand Down
Loading
Loading