diff --git a/SOURCES/nss-pam-ldapd-bz1676861-Increase-size-of-config-file-token.patch b/SOURCES/nss-pam-ldapd-bz1676861-Increase-size-of-config-file-token.patch new file mode 100644 index 0000000..79f03cf --- /dev/null +++ b/SOURCES/nss-pam-ldapd-bz1676861-Increase-size-of-config-file-token.patch @@ -0,0 +1,27 @@ +From 9760dcef59da6ffbf1826724fa79621d74255e06 Mon Sep 17 00:00:00 2001 +From: Arthur de Jong +Date: Sat, 23 Dec 2017 17:58:27 +0100 +Subject: [PATCH] Increase size of config file token + +This increases the maximum size of tokens that are read from the +nslcd.conf configuration file to 256 characters. This was a problem for +some very long uri values. + +Closes https://github.com/arthurdejong/nss-pam-ldapd/issues/21 +--- + nslcd/cfg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nslcd/cfg.c b/nslcd/cfg.c +index a6cfeb32..60d860e7 100644 +--- a/nslcd/cfg.c ++++ b/nslcd/cfg.c +@@ -1265,7 +1265,7 @@ static void cfg_read(const char *filename, struct ldap_config *cfg) + char linebuf[MAX_LINE_LENGTH]; + char *line; + char keyword[32]; +- char token[64]; ++ char token[256]; + int i; + #ifdef LDAP_OPT_X_TLS + int rc; diff --git a/SPECS/nss-pam-ldapd.spec b/SPECS/nss-pam-ldapd.spec index e6e0844..a1c51e7 100644 --- a/SPECS/nss-pam-ldapd.spec +++ b/SPECS/nss-pam-ldapd.spec @@ -39,7 +39,7 @@ Name: nss-pam-ldapd Version: 0.8.13 -Release: 16%{?dist} +Release: 16%{?dist}.1 Summary: An nsswitch module which uses directory servers Group: System Environment/Base License: LGPLv2+ @@ -63,6 +63,7 @@ Patch11: nss-pam-ldapd-0.8.13-avoid-lockout-on-bad-password.patch Patch12: nss-pam-ldapd-0.8.13-password-longer-than-64-chars.patch Patch13: nss-pam-ldapd-0.8.13-uri-man-fix.patch Patch14: nss-pam-ldapd-0.8.13-uid_formatting.patch +Patch15: nss-pam-ldapd-bz1676861-Increase-size-of-config-file-token.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openldap-devel, krb5-devel @@ -124,6 +125,7 @@ nsswitch module. %patch12 -p1 -b .long_password %patch13 -p1 -b .uri_list %patch14 -p1 -b .uid_formatting +%patch15 -p1 -b .config_token_size autoreconf -f -i %build @@ -360,6 +362,9 @@ exit 0 %endif %changelog +* Thu Mar 14 2019 Jakub Hrozek - 0.8.13-16.1 +- Resolves: rhbz#1689119 - nslcd fails to connect to ldap if fqdn is large [rhel-7.6.z] + * Tue Oct 24 2017 Jakub Hrozek - 0.8.13-16 - Resolves: rhbz#1151675 - NSLCD WRAPS LDAP USER UIDNUMBER > 2^31 SO UID IS WRONG (AND A NEGATIVE NUMBER)