From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 23 Feb 2005 16:08:11 +0000 (+0000)
Subject: ITS#3583
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~129
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2d98546d21d0eaab019f8c9b22d52622925e5d58;p=openldap

ITS#3583
---

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index f67c7e8f81..7b16044683 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1191,8 +1191,8 @@ static int parseSubentries (
 
 	/* FIXME: should use BER library */
 	if( ( ctrl->ldctl_value.bv_len != 3 )
-		&& ( ctrl->ldctl_value.bv_val[0] != 0x01 )
-		&& ( ctrl->ldctl_value.bv_val[1] != 0x01 ))
+		|| ( ctrl->ldctl_value.bv_val[0] != 0x01 )
+		|| ( ctrl->ldctl_value.bv_val[1] != 0x01 ))
 	{
 		rs->sr_text = "subentries control value encoding is bogus";
 		return LDAP_PROTOCOL_ERROR;
@@ -1202,8 +1202,9 @@ static int parseSubentries (
 		? SLAP_CONTROL_CRITICAL
 		: SLAP_CONTROL_NONCRITICAL;
 
-	if ( (void *)(ctrl->ldctl_value.bv_val[2] != 0x00))
+	if ( (void *)(ctrl->ldctl_value.bv_val[2] != 0x00)) {
 		set_subentries_visibility( op );
+	}
 
 	return LDAP_SUCCESS;
 }