1
0
forked from pool/nss-pam-ldapd

Accepting request 403884 from home:jengelh:branches:network:ldap

- Do not suppress errors from useradd/groupadd.  Reduce dependencies for it.

OBS-URL: https://build.opensuse.org/request/show/403884
OBS-URL: https://build.opensuse.org/package/show/network:ldap/nss-pam-ldapd?expand=0&rev=6
This commit is contained in:
Michael Vetter 2016-06-21 14:10:19 +00:00 committed by Git OBS Bridge
parent 9f727145af
commit 630ba6192f
2 changed files with 9 additions and 4 deletions

View File

@ -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 Fri Jun 17 11:59:06 UTC 2016 - mvetter@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package nss-pam-ldapd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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+ License: LGPL-2.1+
Group: Productivity/Networking/LDAP/Clients Group: Productivity/Networking/LDAP/Clients
Url: http://arthurdejong.org/nss-ldapd/ Url: http://arthurdejong.org/nss-ldapd/
PreReq: /bin/chmod Requires(pre): shadow
PreReq: shadow
Conflicts: nss_ldap pam_ldap Conflicts: nss_ldap pam_ldap
Obsoletes: nss-ldapd < %{version}-%{release} Obsoletes: nss-ldapd < %{version}-%{release}
Provides: nss-ldapd = %{version}-%{release} Provides: nss-ldapd = %{version}-%{release}
@ -71,7 +70,7 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcnslcd
%pre %pre
# creating groupd and user nslcd # 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 || \ %{_bindir}/getent passwd nslcd >/dev/null || \
%{_sbindir}/useradd -r -g nslcd -d / -s /sbin/nologin \ %{_sbindir}/useradd -r -g nslcd -d / -s /sbin/nologin \
-c "nslcd ldap user" nslcd -c "nslcd ldap user" nslcd