From e9a36c690b63ac0c4a5c9a6ffc6b54eb4037d5e311ac518d51778ea3ac2e8ec0 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 8 Sep 2021 14:31:16 +0000 Subject: [PATCH] Accepting request 917595 from home:kukuk:tiu - Add support for new shell field [bsc#1189518] OBS-URL: https://build.opensuse.org/request/show/917595 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=50 --- sysuser-tools.changes | 5 +++++ sysusers2shadow.sh | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sysuser-tools.changes b/sysuser-tools.changes index cc54f6d..6c32245 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 8 09:12:05 UTC 2021 - Thorsten Kukuk + +- Add support for new shell field [bsc#1189518] + ------------------------------------------------------------------- Thu Jul 15 06:45:15 UTC 2021 - Thorsten Kukuk diff --git a/sysusers2shadow.sh b/sysusers2shadow.sh index 4bd4b26..1cbfa44 100644 --- a/sysusers2shadow.sh +++ b/sysusers2shadow.sh @@ -56,6 +56,13 @@ else homedir="$4" fi + # Set shell only if not null, empty nor '-' + if [ "${5:--}" != "-" ]; then + ARGUMENTS="$ARGUMENTS -s $5" + else + ARGUMENTS="$ARGUMENTS -s /usr/sbin/nologin" + fi + if [ -x /usr/sbin/useradd ]; then if ! /usr/bin/getent passwd "$1" >> /dev/null; then # this is useradd/shadow specific @@ -65,13 +72,13 @@ else ARGUMENTS="-U $ARGUMENTS" fi - run /usr/sbin/useradd -r -s /usr/sbin/nologin -c "$3" -d "${homedir}" $ARGUMENTS + run /usr/sbin/useradd -r -c "$3" -d "${homedir}" $ARGUMENTS fi elif [ -x "$busybox" ]; then /usr/bin/getent group "$1" >> /dev/null || $busybox addgroup -S "$1" if ! /usr/bin/getent passwd "$1" >> /dev/null; then - run $busybox adduser -S -H -s /usr/sbin/nologin -g "$3" -G "$1" -h "${homedir}" $ARGUMENTS + run $busybox adduser -S -H -g "$3" -G "$1" -h "${homedir}" $ARGUMENTS fi else echo "ERROR: neither useradd nor busybox found!"