From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 14 Oct 2006 09:31:09 +0000 (+0000)
Subject: import fix to ITS#4711
X-Git-Tag: OPENLDAP_REL_ENG_2_3_28~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2ea741df2947934245095ba184dcf189914f728;p=thirdparty%2Fopenldap.git

import fix to ITS#4711
---

diff --git a/CHANGES b/CHANGES
index 71a8f56a92..d313a21b45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 OpenLDAP 2.3 Change Log
+	Fixed slapd-meta DN massage error code handling (ITS#4711)
 
 OpenLDAP 2.3.28 Engineering
 	Fixed libldap ldap.conf max line length (ITS#4669)
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index edbf6550ea..b0587c3fe4 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -154,16 +154,16 @@ meta_back_search_start(
 	 */
 	dc->ctx = "searchBase";
 	switch ( ldap_back_dn_massage( dc, &realbase, &mbase ) ) {
-	default:
+	case LDAP_SUCCESS:
 		break;
 
-	case REWRITE_REGEXEC_UNWILLING:
+	case LDAP_UNWILLING_TO_PERFORM:
 		rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
 		rs->sr_text = "Operation not allowed";
 		send_ldap_result( op, rs );
 		return META_SEARCH_ERR;
 
-	case REWRITE_REGEXEC_ERR:
+	default:
 
 		/*
 		 * this target is no longer candidate