new upstream release (2.4.38)

Resolves: #1031608
This commit is contained in:
Jan Synacek 2013-11-18 12:52:27 +01:00
parent 3589b29979
commit 6a944922ab
4 changed files with 7 additions and 35 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/openldap-2.4.35.tgz
/openldap-2.4.36.tgz
/openldap-2.4.37.tgz
/openldap-2.4.38.tgz

View File

@ -1,29 +0,0 @@
Resolves: RHBZ#1028935
From d37da266c6b7196abc758daa870e893eb7c22dce 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
If an 'include' directive contains a custom file instead of a schema file,
process it as well.
---
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

View File

@ -4,8 +4,8 @@
%global check_password_version 1.1
Name: openldap
Version: 2.4.37
Release: 2%{?dist}
Version: 2.4.38
Release: 1%{?dist}
Summary: LDAP support libraries
Group: System Environment/Daemons
License: OpenLDAP
@ -48,8 +48,6 @@ Patch16: openldap-nss-pk11-freeslot.patch
Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
# ldapi sasl fix pending upstream inclusion
Patch20: openldap-ldapi-sasl.patch
# slaptest fix pending upstream inclusion
Patch21: openldap-config-build-schema-inc.patch
# Fedora specific patches
Patch100: openldap-autoconf-pkgconfig-nss.patch
@ -166,7 +164,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch16 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch102 -p1
@ -602,6 +599,9 @@ exit 0
%{_mandir}/man3/*
%changelog
* Mon Nov 18 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.38-1
- new upstream release (#1031608)
* Mon Nov 11 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.37-2
- fix: slaptest incorrectly handles 'include' directives containing a custom file (#1028935)

View File

@ -1,2 +1,2 @@
49f0e9a77ddd0d49f88bf7233a51efa8 openldap-2.4.37.tgz
39831848c731bcaef235a04e0d14412f openldap-2.4.38.tgz
3535b7cd46dcf41c9a9480efa9e64618 ltb-project-openldap-ppolicy-check-password-1.1.tar.gz