diff options
Diffstat (limited to 'source/a')
| -rw-r--r-- | source/a/shadow/login.defs | 29 | ||||
| -rwxr-xr-x | source/a/shadow/shadow.SlackBuild | 25 |
2 files changed, 43 insertions, 11 deletions
diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs index e52f91a53..0e137a35a 100644 --- a/source/a/shadow/login.defs +++ b/source/a/shadow/login.defs @@ -30,6 +30,15 @@ LOG_OK_LOGINS no LASTLOG_ENAB yes # +# Limit the highest user ID number for which the lastlog entries should +# be updated. +# +# No LASTLOG_UID_MAX means that there is no user ID limit for writing +# lastlog entries. +# +#LASTLOG_UID_MAX + +# # Enable checking and display of mailbox status upon login. # # Disable if the shell startup files already check for mail @@ -297,6 +306,7 @@ CHFN_RESTRICT frwh # If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password +# If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password # If set to DES, DES-based algorithm will be used for encrypting password (default) # Overrides the MD5_CRYPT_ENAB option # @@ -315,8 +325,23 @@ ENCRYPT_METHOD SHA256 # If only one of the MIN or MAX values is set, then this value will be used. # If MIN > MAX, the highest value will be used. # -# SHA_CRYPT_MIN_ROUNDS 5000 -# SHA_CRYPT_MAX_ROUNDS 5000 +#SHA_CRYPT_MIN_ROUNDS 5000 +#SHA_CRYPT_MAX_ROUNDS 5000 + +# +# Only works if ENCRYPT_METHOD is set to BCRYPT. +# +# Define the number of BCRYPT rounds. +# With a lot of rounds, it is more difficult to brute-force the password. +# However, more CPU resources will be needed to authenticate users if +# this value is increased. +# +# If not specified, 13 rounds will be attempted. +# If only one of the MIN or MAX values is set, then this value will be used. +# If MIN > MAX, the highest value will be used. +# +#BCRYPT_MIN_ROUNDS 13 +#BCRYPT_MAX_ROUNDS 13 # # List of groups to add to the user's supplementary group set diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index b99ad869e..fd184bb94 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:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -96,6 +96,8 @@ fi CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --sbindir=/usr/sbin \ + --bindir=/usr/bin \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/shadow-$VERSION \ @@ -114,6 +116,19 @@ make install DESTDIR=$PKG || exit 1 zcat $CWD/useradd.gz > $PKG/etc/default/useradd mv $PKG/etc/default/useradd $PKG/etc/default/useradd.new +# Put some stuff back in "old" locations and make symlinks for compat +mkdir -p $PKG/bin $PKG/sbin +( cd $PKG/usr/bin + mv groups ../../bin + mv login ../../bin + mv su ../../bin + mv faillog ../sbin + mv lastlog ../sbin + ln -s ../sbin/faillog + ln -s ../sbin/lastlog +) +mv $PKG/usr/sbin/nologin $PKG/sbin/nologin + # /bin/groups is provided by coreutils. rm -f $PKG/bin/groups find $PKG -name groups.1 -exec rm {} \+ @@ -144,14 +159,6 @@ cp -a src/sulogin $PKG/sbin mkdir -p $PKG/var/log touch $PKG/var/log/faillog.new -# Put some stuff back in "old" locations and make symlinks for compat -( cd $PKG/usr/bin - mv faillog ../sbin - mv lastlog ../sbin - ln -s ../sbin/faillog - ln -s ../sbin/lastlog -) - # Use 4711 rather than 4755 permissions where setuid root is required: find $PKG -type f -perm 4755 -exec chmod 4711 "{}" \+ |