From c1bd7d850387ba9a0a249c11ffbe7fe18aa09dfb Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Fri, 16 Jan 2015 10:08:38 +0100 Subject: [PATCH] remove openldap-ldaprc-currentdir.patch The upstream ITS has been fixed a long time ago and this patch is Fedora specific and pointless. --- openldap-ldaprc-currentdir.patch | 20 -------------------- openldap.spec | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 openldap-ldaprc-currentdir.patch diff --git a/openldap-ldaprc-currentdir.patch b/openldap-ldaprc-currentdir.patch deleted file mode 100644 index 420c1f9..0000000 --- a/openldap-ldaprc-currentdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -Disables opening of ldaprc file in current directory. - -Resolves: #38402 -Upstream: ITS #1131 -Author: Henning Schmiedehausen - -diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c -index 8617527..e6b17b4 100644 ---- a/libraries/libldap/init.c -+++ b/libraries/libldap/init.c -@@ -352,9 +352,6 @@ static void openldap_ldap_init_w_userconf(const char *file) - if(path != NULL) { - LDAP_FREE(path); - } -- -- /* try file */ -- openldap_ldap_init_w_conf(file, 1); - } - - static void openldap_ldap_init_w_env( diff --git a/openldap.spec b/openldap.spec index ab36e59..1d7f708 100644 --- a/openldap.spec +++ b/openldap.spec @@ -28,7 +28,6 @@ Patch0: openldap-manpages.patch Patch2: openldap-sql-linking.patch Patch3: openldap-reentrant-gethostby.patch Patch4: openldap-smbk5pwd-overlay.patch -Patch5: openldap-ldaprc-currentdir.patch Patch6: openldap-userconfig-setgid.patch Patch8: openldap-syncrepl-unset-tls-options.patch Patch9: openldap-man-sasl-nocanon.patch @@ -153,7 +152,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch8 -p1 %patch9 -p1 @@ -585,6 +583,7 @@ exit 0 %changelog * Fri Jan 16 2015 Jan Synáček - 2.4.40-6 - remove openldap-fedora-systemd.patch +- remove openldap-ldaprc-currentdir.patch * Wed Dec 17 2014 Jan Synáček - 2.4.40-5 - harden the build