From: Howard Chu <hyc@openldap.org>
Date: Sat, 20 Dec 2003 14:35:13 +0000 (+0000)
Subject: Fix handling of an_oc_exclude
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~124
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b44c72d849cfb8de824347a7f87b502f4275c83;p=openldap

Fix handling of an_oc_exclude
---

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index c4029df925..6a54a9bb74 100644
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -310,10 +310,11 @@ replog1(
 						for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) {
 							if ( an->an_oc ) {
 								ocs = 1;
+								match |= an->an_oc_exclude;
 								if ( ml->sml_bvalues[i].bv_len == an->an_name.bv_len
 									&& !strcasecmp(ml->sml_bvalues[i].bv_val,
 										an->an_name.bv_val ) ) {
-									match = 1 ^ an->an_oc_exclude;
+									match = !an->an_oc_exclude;
 									break;
 								}
 							}
@@ -385,10 +386,11 @@ replog1(
 						for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) {
 							if ( an->an_oc ) {
 								ocs = 1;
+								match |= an->an_oc_exclude;
 								if ( a->a_vals[i].bv_len == an->an_name.bv_len
 									&& !strcasecmp(a->a_vals[i].bv_val,
 										an->an_name.bv_val ) ) {
-									match = 1 ^ an->an_oc_exclude;
+									match = !an->an_oc_exclude;
 									break;
 								}
 							}