From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 19:24:27 +0000 (+0000)
Subject: ITS#5751
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~98
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a34d439bc9441451b1d6e406a5cc9ffa97293b5;p=openldap

ITS#5751
---

diff --git a/CHANGES b/CHANGES
index ce70cbde22..c10af5f047 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ OpenLDAP 2.4.13 Engineering
 	Added slapo-constraint support for constraining rename (ITS#5703)
 	Added slapo-constraint support for relax control (ITS#5705)
 	Added slapo-constraint "set" type (ITS#5702)
+	Fixed slapo-constraint filter parsing error (ITS#5751)
 	Fixed slapo-rwm rewriting undefined filter (ITS#5731)
 	Fixed slapo-rwm reusing freed filter (ITS#5732)
 	Added slapo-translucent try local bind when remote fails (ITS#5656)
diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index 10361909bd..ec640d9dad 100644
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -642,6 +642,7 @@ constraint_violation( constraint *c, struct berval *bv, Operation *op, SlapReply
 			Debug( LDAP_DEBUG_ANY,
 				"%s constraint_violation uri filter=\"%s\" invalid\n",
 				op->o_log_prefix, filterstr.bv_val, 0 );
+			rc = LDAP_OTHER;
 
 		} else {
 			Debug(LDAP_DEBUG_TRACE, 
@@ -656,7 +657,7 @@ constraint_violation( constraint *c, struct berval *bv, Operation *op, SlapReply
 		}
 		op->o_tmpfree(filterstr.bv_val, op->o_tmpmemctx);
 
-		if((rc != LDAP_SUCCESS) && (rc != LDAP_NO_SUCH_OBJECT)) {
+		if ((rc != LDAP_SUCCESS) && (rc != LDAP_NO_SUCH_OBJECT)) {
 			return rc; /* unexpected error */
 		}