rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix: using slaptest to convert slapd.conf to LDIF format ignores "loglevel 0"

Browse Source
This commit is contained in:
Jan Synacek 2013-06-14 14:32:16 +02:00
parent ff5c1adb2a
commit 19dea679fe
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openldap-loglevel2bvarray.patch Normal file
View File

@ -0,0 +1,25 @@
From 4261aa541cc2a35812a06042a386b795e2064bfb Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Fri, 14 Jun 2013 12:36:48 +0200
Subject: [PATCH] Fix config_build_schema_inc
---
servers/slapd/bconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index def6daf..3c3d3e9 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -6758,7 +6758,7 @@ config_build_schema_inc( ConfigArgs *c, CfEntryInfo *ceparent,
for (; cf; cf=cf->c_sibs, c->depth++) {
if ( !cf->c_at_head && !cf->c_cr_head && !cf->c_oc_head &&
- !cf->c_om_head && !cf->c_syn_head ) continue;
+ !cf->c_om_head && !cf->c_syn_head && !cf->c_kids ) continue;
c->value_dn.bv_val = c->log;
LUTIL_SLASHPATH( cf->c_file.bv_val );
bv.bv_val = strrchr(cf->c_file.bv_val, LDAP_DIRSEP[0]);
--
1.8.1.4

8
openldap.spec
View File

@ -5,7 +5,7 @@
Name: openldap
Version: 2.4.35
Release: 4%{?dist}
Release: 5%{?dist}
Summary: LDAP support libraries
Group: System Environment/Daemons
License: OpenLDAP
@ -52,6 +52,8 @@ Patch18: openldap-doc2.patch
Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
# ldapi sasl fix pending upstream inclusion
Patch20: openldap-ldapi-sasl.patch
# already included upstream
Patch21: openldap-loglevel2bvarray.patch
# Fedora specific patches
Patch100: openldap-autoconf-pkgconfig-nss.patch
@ -171,6 +173,7 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch102 -p1
@ -600,6 +603,9 @@ exit 0
%{_mandir}/man3/*
%changelog
* Fri Jun 14 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.35-5
- fix: using slaptest to convert slapd.conf to LDIF format ignores "loglevel 0"
* Thu May 09 2013 Jan Synáček <jsynacek@redhat.com> 2.4.35-4
- do not needlessly run ldconfig after installing openldap-devel
- fix: LDAPI with GSSAPI does not work if SASL_NOCANON=on (#960222)