https://bugzilla.opensuse.org/show_bug.cgi?id=1181328

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysuser-tools?expand=0&rev=14

sysuser-tools.changes

@@ -1,30 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 20 15:06:51 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
-
-- Ignore nscd return code
-
--------------------------------------------------------------------
-Tue Jan 19 15:15:41 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
-
-- If systemd-sysusers is used to create a new user/group, invalidate
-  the nscd passwd and group cache to make the new user/group
-  visible immediately as workaround [bsc#1181121].
-  Needs to be removed after sytemd-sysusers get's fixed, since we
-  invalidate the cache even if the user/group file wasn't changed.
-
--------------------------------------------------------------------
-Sun Jan 17 21:16:25 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
-
-- An "u" in a sysusers.d file will create an user and a group.
-  Create provides for both, user and group.
-
--------------------------------------------------------------------
-Thu Jan 14 14:30:20 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
-
-- Use systemd-sysusers as default to create and update the user
-  account. Fixes the problem that a modified sysusers config file
-  get's ignored by useradd and adduser [bsc#1180549].
-
 -------------------------------------------------------------------
 Fri Dec  4 10:54:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 

sysuser-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sysuser-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@ Generate auto provides for system users.
 %package -n sysuser-shadow
 Summary:        Tool to execute sysusers.d with shadow utilities
 Group:          System/Packages
-Requires(pre):  (/usr/sbin/useradd or busybox or /usr/bin/systemd-sysusers)
+PreReq:         useradd_or_adduser_dep
 # prefer original shadow over busybox by default
 Suggests:       shadow
 

sysusers.prov

@@ -11,7 +11,6 @@ parse()
 			echo "group($2)"
 		elif [ "$1" = 'u' ]; then
 			echo "user($2)"
-			echo "group($2)"
 		fi
 	done
 }

sysusers2shadow.sh

@@ -7,24 +7,12 @@ run() {
 	"$@"
 }
 
-if [ -x /usr/bin/systemd-sysusers ]; then
+# Absolute path to busybox, if found
+busybox=
+for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i; done
 
-    # Use systemd-sysusers and let it read the input directly from stdin
+while read LINE
-    /usr/bin/systemd-sysusers -
+do
-    # We need to clear the nscd cache, as systemd-sysusers could have
-    # triggered a negative cache entry
-    if [ -x /usr/sbin/nscd ]; then
-	/usr/sbin/nscd -i passwd ||:
-	/usr/sbin/nscd -i group ||:
-    fi
-else
-
-    # Absolute path to busybox, if found
-    busybox=
-    for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i; done
-
-    while read LINE
-    do
 	# "eval set" to do proper splitting while respecting quotes
 	eval set -- $LINE
 	case "${1-}" in
@@ -100,5 +88,4 @@ else
 	    exit 1
 	    ;;
 	esac
-    done
+done
-fi