]> git.sur5r.net Git - openldap/commitdiff
Fix handling of an_oc_exclude
authorHoward Chu <hyc@openldap.org>
Sat, 20 Dec 2003 14:35:13 +0000 (14:35 +0000)
committerHoward Chu <hyc@openldap.org>
Sat, 20 Dec 2003 14:35:13 +0000 (14:35 +0000)
servers/slapd/repl.c

index c4029df92517e5dabd469fed594f08a817f59e5a..6a54a9bb74948d4472aaafa156b0a5de2d4fce82 100644 (file)
@@ -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;
                                                                }
                                                        }