X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fattribute.c;h=0dc5daf03a20fb31a7e4f2f50743b0f0b0145520;hb=82540c5cc1be5bf17b22f3a41d12d1bc56180654;hp=92153f34a7ba36396a80105fa6583f136331c3e6;hpb=fafce1601e5bcd0eca185a2a0366cd2b198121a6;p=openldap

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index 92153f34a7..0dc5daf03a 100644
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -16,7 +16,6 @@
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
-
 /* return LDAP_SUCCESS IFF we can retrieve the attributes
  * of entry with e_ndn
  */
@@ -28,24 +27,25 @@ ldbm_back_attribute(
 	Entry	*target,
 	struct berval	*entry_ndn,
 	AttributeDescription *entry_at,
-	BVarray *vals )
+	BerVarray *vals )
 {
 	struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
 	Entry	     *e;
 	int	     rc;
 	Attribute   *attr;
-	BVarray v;
+	BerVarray v;
 	const char *entry_at_name = entry_at->ad_cname.bv_val;
 	struct berval *iv, *jv;
+	AccessControlState acl_state = ACL_STATE_INIT;
+	int nvals = 0;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-		"ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val ));
-	LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-		"ldbm_back_attribute: at: \"%s\"\n", entry_at_name));
-	LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-		"ldbm_back_attribute: tr dn: \"%s\"\n",
-		target ? target->e_ndn : "" ));
+	LDAP_LOG( BACK_LDBM, ARGS,
+		"ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
+	LDAP_LOG( BACK_LDBM, ARGS, 
+		"ldbm_back_attribute: at: \"%s\"\n", entry_at_name, 0, 0);
+	LDAP_LOG( BACK_LDBM, ARGS, "ldbm_back_attribute: tr dn: \"%s\"\n",
+		target ? target->e_ndn : "", 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS,
 		"=> ldbm_back_attribute: gr dn: \"%s\"\n",
@@ -63,9 +63,9 @@ ldbm_back_attribute(
 		/* we already have a LOCKED copy of the entry */
 		e = target;
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			"ldbm_back_attribute: target is LOCKED (%s)\n",
-			entry_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_attribute: target is LOCKED (%s)\n", 
+			entry_ndn->bv_val, 0, 0);
 #else
 		Debug( LDAP_DEBUG_ARGS,
 			"=> ldbm_back_attribute: target is entry: \"%s\"\n",
@@ -77,9 +77,9 @@ ldbm_back_attribute(
 		/* can we find entry with reader lock */
 		if ((e = dn2entry_r(be, entry_ndn, NULL )) == NULL) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+			LDAP_LOG( BACK_LDBM, INFO, 
 				"ldbm_back_attribute: cannot find entry (%s)\n",
-				entry_ndn->bv_val ));
+				entry_ndn->bv_val, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ACL,
 				"=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
@@ -90,9 +90,8 @@ ldbm_back_attribute(
 		}
 		
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			"ldbm_back_attribute: found entry (%s)\n",
-			entry_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_attribute: found entry (%s)\n", entry_ndn->bv_val, 0, 0);
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"=> ldbm_back_attribute: found entry: \"%s\"\n",
@@ -102,11 +101,11 @@ ldbm_back_attribute(
     }
 
 	/* find attribute values */
-	
+
 	if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_attribute: entry (%s) is an alias\n", e->e_dn ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_attribute: entry (%s) is an alias\n", e->e_dn, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_attribute: entry is an alias\n", 0, 0, 0 );
@@ -118,8 +117,8 @@ ldbm_back_attribute(
 
 	if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_attribute: entry (%s) is a referral.\n", e->e_dn ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_attribute: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_attribute: entry is an referral\n", 0, 0, 0 );
@@ -130,8 +129,8 @@ ldbm_back_attribute(
 	}
 
 	if (conn != NULL && op != NULL
-		&& access_allowed(be, conn, op, e, slap_schema.si_ad_entry,
-			NULL, ACL_READ) == 0)
+		&& access_allowed( be, conn, op, e, slap_schema.si_ad_entry,
+			NULL, ACL_READ, NULL ) == 0)
 	{
 		rc = LDAP_INSUFFICIENT_ACCESS;
 		goto return_results;
@@ -139,8 +138,8 @@ ldbm_back_attribute(
 
 	if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_attribute: failed to find %s.\n", entry_at_name ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_attribute: failed to find %s.\n", entry_at_name, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_attribute: failed to find %s\n",
@@ -152,7 +151,8 @@ ldbm_back_attribute(
 	}
 
 	if (conn != NULL && op != NULL
-		&& access_allowed(be, conn, op, e, entry_at, NULL, ACL_READ) == 0)
+		&& access_allowed( be, conn, op, e, entry_at, NULL,
+			ACL_READ, &acl_state ) == 0)
 	{
 		rc = LDAP_INSUFFICIENT_ACCESS;
 		goto return_results;
@@ -162,13 +162,13 @@ ldbm_back_attribute(
 		/* count them */
 	}
 
-	v = (BVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
+	v = (BerVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
 
 	for ( iv=attr->a_vals, jv=v; iv->bv_val; iv++ ) {
 		if( conn != NULL
 			&& op != NULL
-			&& access_allowed(be, conn, op, e, entry_at,
-				iv, ACL_READ) == 0)
+			&& access_allowed( be, conn, op, e, entry_at,
+				iv, ACL_READ, &acl_state ) == 0)
 		{
 			continue;
 		}
@@ -177,6 +177,8 @@ ldbm_back_attribute(
 		if( jv->bv_val != NULL ) jv++;
 	}
 
+	nvals = jv - v;
+
 	if( jv == v ) {
 		ch_free( v );
 		*vals = NULL;
@@ -194,13 +196,12 @@ return_results:
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "ldbm_back_attribute: rc=%d nvals=%d.\n",
-		   rc, jv - v ));
+	LDAP_LOG( BACK_LDBM, ENTRY, 
+		"ldbm_back_attribute: rc=%d nvals=%d.\n", rc, nvals, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
 		"ldbm_back_attribute: rc=%d nvals=%d\n",
-		rc, jv - v, 0 ); 
+		rc, nvals, 0 ); 
 #endif
 
 	return(rc);