Apply a patch from Stanislav Moravec to fix nslcd return code

Resolves: rhbz#1356561 - nslcd.service entering failed state when stopped via systemctl stop nslcd.service
This commit is contained in:
Jakub Hrozek 2017-02-08 09:47:16 +01:00
parent e642f1149f
commit 5590f3de9b
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,10 @@
diff -up nss-pam-ldapd-0.8.14/nslcd/nslcd.c.retcode nss-pam-ldapd-0.8.14/nslcd/nslcd.c
--- nss-pam-ldapd-0.8.14/nslcd/nslcd.c.retcode 2017-02-08 09:52:39.687834074 +0100
+++ nss-pam-ldapd-0.8.14/nslcd/nslcd.c 2017-02-08 09:52:54.630891580 +0100
@@ -866,5 +866,5 @@ int main(int argc,char *argv[])
log_log(LOG_ERR,"thread %d is still running, shutting down anyway",i);
}
/* we're done */
- return EXIT_FAILURE;
+ return EXIT_SUCCESS;
}

View File

@ -39,7 +39,7 @@
Name: nss-pam-ldapd
Version: 0.8.14
Release: 6%{?dist}
Release: 8%{?dist}
Summary: An nsswitch module which uses directory servers
Group: System Environment/Base
License: LGPLv2+
@ -51,6 +51,7 @@ Source3: nslcd.tmpfiles
Source4: nslcd.service
Patch1: nss-pam-ldapd-0.8.12-validname.patch
Patch2: nss-pam-ldapd-0.8.12-uid-overflow.patch
Patch3: nss-pam-ldapd-exitcode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openldap-devel, krb5-devel
BuildRequires: autoconf, automake
@ -99,6 +100,7 @@ nsswitch module.
%setup -q
%patch1 -p0 -b .validname
%patch2 -p1 -b .overflow
%patch3 -p1 -b .returncode
autoreconf -f -i
%build
@ -336,6 +338,9 @@ exit 0
%endif
%changelog
* Wed Feb 8 2017 Jakub Hrozek <jhrozek@redhat.com> 0.8.14-8
- Apply a patch from Stanislav Moravec to fix nslcd return code
* Tue Mar 29 2016 Nalin Dahyabhai <nalin@redhat.com> 0.8.14-7
- move the packaged tmpfiles.d file from /etc/tmpfiles.d to %%{_tmpfilesdir},
per heads-up from Ville Skyttä on devel@