diff options
Diffstat (limited to 'source/a/shadow')
| -rw-r--r-- | source/a/shadow/doinst.sh | 27 | ||||
| -rw-r--r-- | source/a/shadow/pam.d/chfn | 4 | ||||
| -rw-r--r-- | source/a/shadow/pam.d/chsh | 4 | ||||
| -rw-r--r-- | source/a/shadow/pam.d/login | 11 | ||||
| -rw-r--r-- | source/a/shadow/pam.d/su | 11 | ||||
| -rw-r--r-- | source/a/shadow/pam.d/su-l | 6 | ||||
| -rwxr-xr-x | source/a/shadow/shadow.SlackBuild | 2 |
7 files changed, 16 insertions, 49 deletions
diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh index ce3e8116a..98c8a92c5 100644 --- a/source/a/shadow/doinst.sh +++ b/source/a/shadow/doinst.sh @@ -10,17 +10,20 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# First, check for PAM: -if [ -r etc/pam.d/login.new ]; then - # If there's an existing /etc/login.defs that contains an obsolete option - # intended for a non-pam system, rename it to back it up and allow the - # pam-enabled login.defs to be installed automatically: - if grep -q "^LASTLOG_ENAB" etc/login.defs 1> /dev/null 2> /dev/null ; then - mv etc/login.defs etc/login.defs.non-pam.backup - fi -else # Same thing, but in reverse for a non-pam system: - if ! grep -q "^LASTLOG_ENAB" etc/login.defs 1> /dev/null 2> /dev/null ; then - mv etc/login.defs etc/login.defs.pam.backup +# See if we need to backup an existing login.defs: +if [ -r etc/login.defs ]; then + # First, check for PAM: + if [ -r etc/pam.d/login.new ]; then + # If there's an existing /etc/login.defs that contains an obsolete option + # intended for a non-pam system, rename it to back it up and allow the + # pam-enabled login.defs to be installed automatically: + if grep -q "^LASTLOG_ENAB" etc/login.defs 1> /dev/null 2> /dev/null ; then + mv etc/login.defs etc/login.defs.non-pam.backup + fi + else # Same thing, but in reverse for a non-pam system: + if ! grep -q "^LASTLOG_ENAB" etc/login.defs 1> /dev/null 2> /dev/null ; then + mv etc/login.defs etc/login.defs.pam.backup + fi fi fi @@ -31,7 +34,7 @@ rm -f var/log/faillog.new if [ -r etc/login.access.new ]; then config etc/login.access.new fi -for configfile in chage.new chfn.new chgpasswd.new chpasswd.new chsh.new groupadd.new groupdel.new groupmems.new groupmod.new login.new newusers.new other.new passwd.new postlogin.new su-l.new su.new system-auth.new useradd.new userdel.new usermod.new ; do +for configfile in chage.new chgpasswd.new chpasswd.new groupadd.new groupdel.new groupmems.new groupmod.new newusers.new other.new passwd.new postlogin.new system-auth.new useradd.new userdel.new usermod.new ; do if [ -r etc/pam.d/$configfile ]; then config etc/pam.d/$configfile fi diff --git a/source/a/shadow/pam.d/chfn b/source/a/shadow/pam.d/chfn deleted file mode 100644 index 8f49f5cc8..000000000 --- a/source/a/shadow/pam.d/chfn +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/source/a/shadow/pam.d/chsh b/source/a/shadow/pam.d/chsh deleted file mode 100644 index 8f49f5cc8..000000000 --- a/source/a/shadow/pam.d/chsh +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/source/a/shadow/pam.d/login b/source/a/shadow/pam.d/login deleted file mode 100644 index eb3121996..000000000 --- a/source/a/shadow/pam.d/login +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_securetty.so -auth include system-auth -auth include postlogin -account required pam_nologin.so -account include system-auth -password include system-auth -session include system-auth -session include postlogin -session required pam_loginuid.so -session optional pam_ck_connector.so nox11 diff --git a/source/a/shadow/pam.d/su b/source/a/shadow/pam.d/su deleted file mode 100644 index c7c814877..000000000 --- a/source/a/shadow/pam.d/su +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth include system-auth -account include system-auth -password include system-auth -session include system-auth -session optional pam_xauth.so diff --git a/source/a/shadow/pam.d/su-l b/source/a/shadow/pam.d/su-l deleted file mode 100644 index 656a139a8..000000000 --- a/source/a/shadow/pam.d/su-l +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth include su -account include su -password include su -session optional pam_keyinit.so force revoke -session include su diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index bc22d5e84..1cd486be9 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |