- Fix getdef default variables (getdef-new-defs.diff)

OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=5
This commit is contained in:
Thorsten Kukuk 2012-11-13 16:35:05 +00:00 committed by Git OBS Bridge
parent 5eb07eefb8
commit c2ed51b410
4 changed files with 55 additions and 7 deletions

32
getdef-new-defs.diff Normal file
View File

@ -0,0 +1,32 @@
--- lib/getdef.c
+++ lib/getdef.c 2012/11/13 16:26:34
@@ -64,6 +64,7 @@
{"FAKE_SHELL", NULL},
{"GID_MAX", NULL},
{"GID_MIN", NULL},
+ {"GROUPADD_CMD", NULL},
{"HUSHLOGIN_FILE", NULL},
{"KILLCHAR", NULL},
{"LOGIN_RETRIES", NULL},
@@ -93,7 +94,10 @@
{"UID_MAX", NULL},
{"UID_MIN", NULL},
{"UMASK", NULL},
+ {"USERADD_CMD", NULL},
{"USERDEL_CMD", NULL},
+ {"USERDEL_PRECMD", NULL},
+ {"USERDEL_POSTCMD", NULL},
{"USERGROUPS_ENAB", NULL},
#ifndef USE_PAM
{"CHFN_AUTH", NULL},
@@ -129,6 +133,10 @@
{"TCB_SYMLINKS", NULL},
{"USE_TCB", NULL},
#endif
+ /* Used by /bin/login */
+ {"MOTD_FILE", NULL},
+ {"ENV_PATH", NULL},
+ {"ENV_ROOTPATH", NULL},
{NULL, NULL}
};

View File

@ -1,5 +1,5 @@
--- etc/login.defs --- etc/login.defs
+++ etc/login.defs 2012/09/26 12:02:14 +++ etc/login.defs 2012/11/13 16:30:57
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
# #
# /etc/login.defs - Configuration control definitions for the shadow package. # /etc/login.defs - Configuration control definitions for the shadow package.
@ -166,7 +166,16 @@
# Default initial "umask" value used by login on non-PAM enabled systems. # Default initial "umask" value used by login on non-PAM enabled systems.
# Default "umask" value for pam_umask on PAM enabled systems. # Default "umask" value for pam_umask on PAM enabled systems.
@@ -206,40 +123,37 @@ @@ -197,49 +114,44 @@
#
# 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 PASS_WARN_AGE 7
# #
@ -222,7 +231,7 @@
# #
# Max time in seconds for login # Max time in seconds for login
@@ -247,28 +161,6 @@ @@ -247,28 +159,6 @@
LOGIN_TIMEOUT 60 LOGIN_TIMEOUT 60
# #
@ -251,7 +260,7 @@
# Which fields may be changed by regular users using chfn - use # Which fields may be changed by regular users using chfn - use
# any combination of letters "frwh" (full name, room number, work # any combination of letters "frwh" (full name, room number, work
# phone, home phone). If not defined, no changes are allowed. # phone, home phone). If not defined, no changes are allowed.
@@ -277,13 +169,6 @@ @@ -277,13 +167,6 @@
CHFN_RESTRICT rwh CHFN_RESTRICT rwh
# #
@ -265,7 +274,7 @@
# Only works if compiled with MD5_CRYPT defined: # Only works if compiled with MD5_CRYPT defined:
# If set to "yes", new passwords will be encrypted using the MD5-based # If set to "yes", new passwords will be encrypted using the MD5-based
# algorithm compatible with the one used by recent releases of FreeBSD. # algorithm compatible with the one used by recent releases of FreeBSD.
@@ -345,16 +230,12 @@ @@ -345,16 +228,12 @@
DEFAULT_HOME yes DEFAULT_HOME yes
# #
@ -284,7 +293,7 @@
#USERDEL_CMD /usr/sbin/userdel_local #USERDEL_CMD /usr/sbin/userdel_local
# #
@@ -364,7 +245,7 @@ @@ -364,7 +243,7 @@
# #
# This also enables userdel to remove user groups if no members exist. # This also enables userdel to remove user groups if no members exist.
# #
@ -293,7 +302,7 @@
# #
# If set to a non-nul number, the shadow utilities will make sure that # If set to a non-nul number, the shadow utilities will make sure that
@@ -383,5 +264,41 @@ @@ -383,5 +262,41 @@
# This option is overridden with the -M or -m flags on the useradd command # This option is overridden with the -M or -m flags on the useradd command
# line. # line.
# #

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 13 17:31:50 CET 2012 - kukuk@suse.de
- Fix getdef default variables (getdef-new-defs.diff)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 13 10:36:28 CET 2012 - kukuk@suse.de Tue Nov 13 10:36:28 CET 2012 - kukuk@suse.de

View File

@ -34,6 +34,7 @@ Patch1: userdel-scripts.diff
Patch2: useradd-script.diff Patch2: useradd-script.diff
Patch3: chkname-regex.diff Patch3: chkname-regex.diff
Patch4: useradd-default.diff Patch4: useradd-default.diff
Patch5: getdef-new-defs.diff
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
@ -57,6 +58,7 @@ group accounts.
%patch2 -p0 %patch2 -p0
%patch3 -p0 %patch3 -p0
%patch4 -p0 %patch4 -p0
%patch5 -p0
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
mv -v doc/HOWTO.utf8 doc/HOWTO mv -v doc/HOWTO.utf8 doc/HOWTO