[Fedora-directory-commits] ldapserver/ldap/servers/slapd filterentry.c, 1.4.2.2, 1.4.2.3 slapi-private.h, 1.8.2.2, 1.8.2.3 vattr.c, 1.5.2.1, 1.5.2.2

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9966/servers/slapd

Modified Files:
      Tag: Directory71RtmBranch
	filterentry.c slapi-private.h vattr.c 
Log Message:
Related: 448831
Summary: Need to pass pb to vattr_test_filter for fix for bug 448831 to work properly.



Index: filterentry.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filterentry.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- filterentry.c	9 Jul 2008 19:41:45 -0000	1.4.2.2
+++ filterentry.c	10 Jul 2008 19:43:17 -0000	1.4.2.3
@@ -857,7 +857,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc = vattr_test_filter( e, f, FILTER_TYPE_AVA, f->f_ava.ava_type );
+		rc = vattr_test_filter( pb, e, f, FILTER_TYPE_AVA, f->f_ava.ava_type );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
@@ -869,7 +869,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc =  vattr_test_filter( e, f, FILTER_TYPE_SUBSTRING, f->f_sub_type);
+		rc =  vattr_test_filter( pb, e, f, FILTER_TYPE_SUBSTRING, f->f_sub_type);
 		break;
 
 	case LDAP_FILTER_GE:
@@ -882,7 +882,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc = vattr_test_filter( e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
+		rc = vattr_test_filter( pb, e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
 		break;
 
 	case LDAP_FILTER_LE:
@@ -895,7 +895,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc = vattr_test_filter( e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
+		rc = vattr_test_filter( pb, e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
 		break;
 
 	case LDAP_FILTER_PRESENT:
@@ -907,7 +907,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc = vattr_test_filter( e, f, FILTER_TYPE_PRES, f->f_type);		
+		rc = vattr_test_filter( pb, e, f, FILTER_TYPE_PRES, f->f_type);		
 		break;
 
 	case LDAP_FILTER_APPROX:
@@ -920,7 +920,7 @@
 		if ( only_check_access || rc != LDAP_SUCCESS ) {
 			return( rc );
 		}
-		rc = vattr_test_filter( e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
+		rc = vattr_test_filter( pb, e, f, FILTER_TYPE_AVA, f->f_ava.ava_type);
 		break;
 
 	case LDAP_FILTER_EXTENDED:


Index: slapi-private.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- slapi-private.h	9 Jul 2008 19:41:45 -0000	1.8.2.2
+++ slapi-private.h	10 Jul 2008 19:43:17 -0000	1.8.2.3
@@ -465,7 +465,8 @@
 void slapi_vattrcache_cache_all();
 void slapi_vattrcache_cache_none();
 
-int vattr_test_filter(/* Entry we're interested in */ Slapi_Entry *e,						
+int vattr_test_filter( Slapi_PBlock *pb,
+						/* Entry we're interested in */ Slapi_Entry *e,						
 						Slapi_Filter *f,
 						filter_type_t filter_type,
 						char *type);


Index: vattr.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/vattr.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- vattr.c	9 Jul 2008 19:41:45 -0000	1.5.2.1
+++ vattr.c	10 Jul 2008 19:43:17 -0000	1.5.2.2
@@ -383,7 +383,8 @@
  *			>0	an ldap error code 
  *
 */
-int vattr_test_filter( /* Entry we're interested in */ Slapi_Entry *e,    					
+int vattr_test_filter( Slapi_PBlock *pb,
+						/* Entry we're interested in */ Slapi_Entry *e,    					
 						Slapi_Filter *f,
 						filter_type_t filter_type,
 						char * type) {