remove openldap-fedora-systemd.patch
We don't use env variables anymore.
This commit is contained in:
parent
0625d0e501
commit
f1bc6682b9
@ -1,23 +0,0 @@
|
||||
Skip any empty parameters when parsing command line options.
|
||||
This is required because systemd does not expand variables the same way as shell does,
|
||||
we need it because of an empty SLAPD_OPTIONS in environment file.
|
||||
|
||||
Fedora specific patch.
|
||||
|
||||
Author: Jan Vcelak <jvcelak@redhat.com>
|
||||
|
||||
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
|
||||
index dac4864..83614f4 100644
|
||||
--- a/servers/slapd/main.c
|
||||
+++ b/servers/slapd/main.c
|
||||
@@ -685,6 +685,10 @@ unhandled_option:;
|
||||
}
|
||||
}
|
||||
|
||||
+ /* skip empty parameters */
|
||||
+ while ( optind < argc && *argv[optind] == '\0' )
|
||||
+ optind += 1;
|
||||
+
|
||||
if ( optind != argc )
|
||||
goto unhandled_option;
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
Name: openldap
|
||||
Version: 2.4.40
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: LDAP support libraries
|
||||
Group: System Environment/Daemons
|
||||
License: OpenLDAP
|
||||
@ -55,7 +55,6 @@ Patch91: check-password.patch
|
||||
|
||||
# Fedora specific patches
|
||||
Patch100: openldap-autoconf-pkgconfig-nss.patch
|
||||
Patch102: openldap-fedora-systemd.patch
|
||||
|
||||
BuildRequires: cyrus-sasl-devel, nss-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel
|
||||
BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl, perl-devel, perl(ExtUtils::Embed)
|
||||
@ -169,8 +168,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
|
||||
%patch102 -p1
|
||||
|
||||
# build smbk5pwd with other overlays
|
||||
ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
|
||||
mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd
|
||||
@ -586,6 +583,9 @@ exit 0
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2015 Jan Synáček <jsynacek@redhat.com> - 2.4.40-6
|
||||
- remove openldap-fedora-systemd.patch
|
||||
|
||||
* Wed Dec 17 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.40-5
|
||||
- harden the build
|
||||
- improve check_password
|
||||
|
Loading…
Reference in New Issue
Block a user