[Pkg-openldap-devel] [openldap] 01/01: fix onelevel search with mdb (#782212)

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 77837f34a47b04cf6d735a98c695c56ea1052536
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Apr 9 09:10:45 2015 -0700

    fix onelevel search with mdb (#782212)
---
 debian/changelog                                   |  5 ++++-
 .../patches/ITS7975-fix-mdb-onelevel-search.patch  | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ffd885..beed355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ openldap (2.4.40+dfsg-1) unstable; urgency=medium
   * Remove inetorgperson.schema from the upstream source. Replace it with a
     copy stripped of RFC text. (Closes: #780283)
   * Adjust debian/watch for +dfsg versioning.
+  * debian/patches/ITS7975-fix-mdb-onelevel-search.patch: Import upstream
+    patch to fix scope=onelevel searches wrongly including the search base in
+    results under the MDB backend. (ITS#7975) (Closes: #782212)
 
- -- Ryan Tandy <ryan at nardis.ca>  Wed, 11 Mar 2015 14:59:45 -0700
+ -- Ryan Tandy <ryan at nardis.ca>  Thu, 09 Apr 2015 08:38:38 -0700
 
 openldap (2.4.40-4) unstable; urgency=medium
 
diff --git a/debian/patches/ITS7975-fix-mdb-onelevel-search.patch b/debian/patches/ITS7975-fix-mdb-onelevel-search.patch
new file mode 100644
index 0000000..a97081d
--- /dev/null
+++ b/debian/patches/ITS7975-fix-mdb-onelevel-search.patch
@@ -0,0 +1,24 @@
+From e6e073d31e89089a731870799b43de797480306d Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+Date: Wed, 29 Oct 2014 18:05:00 +0000
+Subject: [PATCH] ITS#7975 fix onelevel search
+
+---
+ servers/slapd/back-mdb/search.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
+index 98b5f25..9089016 100644
+--- a/servers/slapd/back-mdb/search.c
++++ b/servers/slapd/back-mdb/search.c
+@@ -837,6 +837,7 @@ loop_begin:
+ 			}
+ 			/* Fall-thru */
+ 		case LDAP_SCOPE_ONELEVEL:
++			if ( id == base->e_id ) break;
+ 			isc.id = id;
+ 			isc.nscope = 0;
+ 			rs->sr_err = mdb_idscopes( op, &isc );
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 45dd92c..3b93b7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
 ITS8027-deref-reject-empty-attr-list.patch
 ITS8046-fix-vrFilter_free-crash.patch
+ITS7975-fix-mdb-onelevel-search.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git