diff --git a/nss-pam-ldapd.changes b/nss-pam-ldapd.changes index 7fa7163..023732d 100644 --- a/nss-pam-ldapd.changes +++ b/nss-pam-ldapd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 12:20:20 UTC 2016 - jengelh@inai.de + +- Do not suppress errors from useradd/groupadd. + Reduce dependencies for it. + ------------------------------------------------------------------- Fri Jun 17 11:59:06 UTC 2016 - mvetter@suse.com diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec index 1d8d337..51e81f4 100644 --- a/nss-pam-ldapd.spec +++ b/nss-pam-ldapd.spec @@ -1,7 +1,7 @@ # # spec file for package nss-pam-ldapd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,8 +28,7 @@ Summary: NSS module and daemon for using LDAP as a naming service License: LGPL-2.1+ Group: Productivity/Networking/LDAP/Clients Url: http://arthurdejong.org/nss-ldapd/ -PreReq: /bin/chmod -PreReq: shadow +Requires(pre): shadow Conflicts: nss_ldap pam_ldap Obsoletes: nss-ldapd < %{version}-%{release} Provides: nss-ldapd = %{version}-%{release} @@ -71,7 +70,7 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcnslcd %pre # creating groupd and user nslcd -%{_bindir}/getent group nslcd >/dev/null || %{_sbindir}/groupadd -r nslcd 2>/dev/null +%{_bindir}/getent group nslcd >/dev/null || %{_sbindir}/groupadd -r nslcd %{_bindir}/getent passwd nslcd >/dev/null || \ %{_sbindir}/useradd -r -g nslcd -d / -s /sbin/nologin \ -c "nslcd ldap user" nslcd