vrFilter -> o_vrFilter

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 39cb6426bb8efd85440900b3ca94e4f9dd117524..b92c4d1cb2072b7f2c3580674161958da16969e3 100644 (file)
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -67,7 +67,7 @@ filter_matched_values(
        Debug( LDAP_DEBUG_FILTER, "=> filter_matched_values\n", 0, 0, 0 );
 #endif
 
-       for ( vrf = op->vrFilter; vrf != NULL; vrf = vrf->vrf_next ) {
+       for ( vrf = op->o_vrFilter; vrf != NULL; vrf = vrf->vrf_next ) {
                switch ( vrf->vrf_choice ) {
                case SLAPD_FILTER_COMPUTED:
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 6e8ee40ab1738b62611d30b2b6dfc6a4d0d554e3..c60f5696e66a24cdef57b1ebc3415e672381fce3 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -698,7 +698,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
         * to particular value of attribute and equals 1 if value matches
         * to ValuesReturnFilter or 0 if not
         */     
-       if ( op->vrFilter != NULL ) {
+       if ( op->o_vrFilter != NULL ) {
                int     k = 0;
                size_t  size;
 
@@ -827,7 +827,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        continue;
                                }
 
-                               if ( op->vrFilter && e_flags[j][i] == 0 ){
+                               if ( op->o_vrFilter && e_flags[j][i] == 0 ){
                                        continue;
                                }
 
@@ -873,7 +873,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        /* only have subschemaSubentry implemented */
        aa = backend_operational( op, rs, opattrs );
 
-       if ( aa != NULL && op->vrFilter != NULL ) {
+       if ( aa != NULL && op->o_vrFilter != NULL ) {
                int     k = 0;
                size_t  size;
 
@@ -1020,7 +1020,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        continue;
                                }
 
-                               if ( op->vrFilter && e_flags[j][i] == 0 ){
+                               if ( op->o_vrFilter && e_flags[j][i] == 0 ){
                                        continue;
                                }