From b7a1385b97b57467b76aa69b4acc24d45157751a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 29 2022 16:19:46 +0000
Subject: import nss-pam-ldapd-0.9.9-5.el8


---

diff --git a/SOURCES/0003-Allow-logging-longer-lines.patch b/SOURCES/0003-Allow-logging-longer-lines.patch
new file mode 100644
index 0000000..302994c
--- /dev/null
+++ b/SOURCES/0003-Allow-logging-longer-lines.patch
@@ -0,0 +1,12 @@
+diff -up a/nslcd/log.c b/nslcd/log.c
+--- a/nslcd/log.c.orig	2021-12-06 14:27:05.912471587 +0100
++++ b/nslcd/log.c	2021-12-06 14:27:35.541779753 +0100
+@@ -230,7 +230,7 @@ void log_log(int pri, const char *format
+ {
+   int res;
+   struct log_cfg *lst;
+-  char buffer[200];
++  char buffer[512];
+   va_list ap;
+ #ifndef TLS
+   char *sessionid, *requestid;
diff --git a/SOURCES/nslcd.service b/SOURCES/nslcd.service
index 61ae1fd..5672791 100644
--- a/SOURCES/nslcd.service
+++ b/SOURCES/nslcd.service
@@ -5,7 +5,7 @@ Documentation=man:nslcd(8) man:nslcd.conf(5)
 
 [Service]
 Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
+PIDFile=/run/nslcd/nslcd.pid
 ExecStart=/usr/sbin/nslcd
 RestartSec=10s
 Restart=on-failure
diff --git a/SOURCES/nslcd.tmpfiles b/SOURCES/nslcd.tmpfiles
index 9e48805..4953cf6 100644
--- a/SOURCES/nslcd.tmpfiles
+++ b/SOURCES/nslcd.tmpfiles
@@ -1,2 +1,2 @@
-# nslcd needs a directory in /var/run to store its pid file and socket
-d /var/run/nslcd 0775 nslcd root
+# nslcd needs a directory in /run to store its pid file and socket
+d /run/nslcd 0775 nslcd root
diff --git a/SPECS/nss-pam-ldapd.spec b/SPECS/nss-pam-ldapd.spec
index b2b862e..3dbe975 100644
--- a/SPECS/nss-pam-ldapd.spec
+++ b/SPECS/nss-pam-ldapd.spec
@@ -5,7 +5,7 @@
 
 Name:           nss-pam-ldapd
 Version:        0.9.9
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        An nsswitch module which uses directory servers
 License:        LGPLv2+
 URL:            http://arthurdejong.org/nss-pam-ldapd/
@@ -18,6 +18,7 @@ Source4:        nslcd.service
 # plus, we don't ship the python utilities
 Patch0001:      0001-Disable-pylint-tests.patch
 Patch0002:      0002-Watch-for-uint32_t-overflows.patch
+Patch0003:      0003-Allow-logging-longer-lines.patch
 
 BuildRequires:  openldap-devel, krb5-devel
 BuildRequires:  autoconf, automake
@@ -51,7 +52,10 @@ autoreconf -f -i
 %build
 %configure --libdir=%{nssdir} \
            --disable-utils \
-           --with-pam-seclib-dir=%{pamdir}
+           --with-pam-seclib-dir=%{pamdir} \
+           --with-nslcd-pidfile=/run/nslcd/nslcd.pid \
+           --with-nslcd-socket=/run/nslcd/socket \
+
 %make_build
 
 %check
@@ -68,7 +72,7 @@ ln -s libnss_ldap.so.2 $RPM_BUILD_ROOT/%{nssdir}/libnss_ldap.so
 sed -i -e 's,^uid.*,uid nslcd,g' -e 's,^gid.*,gid ldap,g' \
 $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
 touch -r nslcd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
-mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/nslcd
+mkdir -p -m 0755 $RPM_BUILD_ROOT/run/nslcd
 mkdir -p -m 0755 $RPM_BUILD_ROOT/%{_tmpfilesdir}
 install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 
@@ -82,7 +86,7 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 %attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/nslcd.conf
 %attr(0644,root,root) %config(noreplace) %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/nslcd.service
-%attr(0775,nslcd,root) /var/run/nslcd
+%attr(0775,nslcd,root) /run/nslcd
 
 %pre
 getent group  ldap  > /dev/null || \
@@ -104,6 +108,14 @@ getent passwd nslcd > /dev/null || \
 %systemd_postun_with_restart nslcd.service
 
 %changelog
+* Mon Dec 6 2021 Tomas Halman <thalman@redhat.com> - 0.9.9-5
+- Resolves: rhbz#2028914 - nslcd prints only 200 characters in error message
+
+* Mon Sep 20 2021 Tomas Halman <thalman@redhat.com> - 0.9.9-4
+- moving temp files from /var/run to /run
+- Resolves: rhbz#1969826 - tmpfiles snippet needs updated path for
+                           nss-pam-ldapd
+
 * Wed May 30 2018 Jakub Hrozek <jhrozek@redhat.com> - 0.9.9-3
 - Also change the pemissions on tmpfiles
 - Related: rhbz#1583211 - nslcd, the local LDAP daemon, fails to start