#include "proto-back-ldbm.h"
-/* return 0 IFF we can retrieve the attributes
+/* return LDAP_SUCCESS IFF we can retrieve the attributes
* of entry with e_ndn
*/
int
Connection *conn,
Operation *op,
Entry *target,
- const char *e_ndn,
+ const char *entry_ndn,
AttributeDescription *entry_at,
- const char ***vals
-)
+ struct berval ***vals )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- Entry *e;
- int i, j, rc = 1;
+ Entry *e;
+ int i, j, rc;
Attribute *attr;
- struct berval **abv;
- char *s, **v;
- const char *entry_at_name = entry_at->ad_cname->bv_val;
-
+ struct berval **v;
+ const char *entry_at_name = entry_at->ad_cname.bv_val;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
+ "ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn ));
+ 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 : "" ));
+#else
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: gr dn: \"%s\"\n",
- e_ndn, 0, 0 );
+ entry_ndn, 0, 0 );
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: at: \"%s\"\n",
entry_at_name, 0, 0 );
Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: tr dn: \"%s\"\n",
target ? target->e_ndn : "", 0, 0 );
+#endif
- if (target != NULL && strcmp(target->e_ndn, e_ndn) == 0) {
+ if (target != NULL && strcmp(target->e_ndn, entry_ndn) == 0) {
/* we already have a LOCKED copy of the entry */
e = target;
- Debug( LDAP_DEBUG_ARGS,
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_back_attribute: target is LOCKED (%s)\n",
+ entry_ndn ));
+#else
+ Debug( LDAP_DEBUG_ARGS,
"=> ldbm_back_attribute: target is entry: \"%s\"\n",
- e_ndn, 0, 0 );
+ entry_ndn, 0, 0 );
+#endif
+
} else {
/* can we find entry with reader lock */
- if ((e = dn2entry_r(be, e_ndn, NULL )) == NULL) {
+ if ((e = dn2entry_r(be, entry_ndn, NULL )) == NULL) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_back_attribute: cannot find entry (%s)\n",
+ entry_ndn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
- e_ndn, 0, 0 );
- return( 1 );
+ entry_ndn, 0, 0 );
+#endif
+
+ return LDAP_NO_SUCH_OBJECT;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_back_attribute: found entry (%s)\n", entry_ndn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> ldbm_back_attribute: found entry: \"%s\"\n",
- e_ndn, 0, 0 );
- }
+ entry_ndn, 0, 0 );
+#endif
- rc = 1;
+ }
- /* find attribute values
- */
-
+ /* 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 ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: entry is an alias\n", 0, 0, 0 );
+#endif
+
+ rc = LDAP_ALIAS_PROBLEM;
goto return_results;
}
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 ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: entry is an referral\n", 0, 0, 0 );
+#endif
+
+ rc = LDAP_REFERRAL;
goto return_results;
}
if (conn != NULL && op != NULL
- && access_allowed(be, conn, op, e, slap_schema.si_ad_entry, NULL, ACL_SEARCH) == 0)
+ && access_allowed(be, conn, op, e, slap_schema.si_ad_entry,
+ NULL, ACL_READ) == 0)
{
+ rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
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 ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= ldbm_back_attribute: failed to find %s\n",
entry_at_name, 0, 0 );
+#endif
+
+ rc = LDAP_NO_SUCH_ATTRIBUTE;
goto return_results;
}
if (conn != NULL && op != NULL
- && access_allowed(be, conn, op, e, entry_at, NULL, ACL_SEARCH) == 0)
+ && access_allowed(be, conn, op, e, entry_at, NULL, ACL_READ) == 0)
{
+ rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
- for ( i = 0; attr->a_vals[i] != NULL; i++ ) { }
- v = (char **) ch_calloc( (i + 1), sizeof(char *) );
- if (v != NULL) {
- for ( j = 0, abv = attr->a_vals; --i >= 0; abv++ ) {
- if ( (*abv)->bv_len > 0 ) {
- s = ch_malloc( (*abv)->bv_len + 1 );
- if( s == NULL )
- break;
- memcpy(s, (*abv)->bv_val, (*abv)->bv_len);
- s[(*abv)->bv_len] = 0;
- v[j++] = s;
- }
+ for ( i = 0; attr->a_vals[i] != NULL; i++ ) {
+ /* count them */
+ }
+
+ v = (struct berval **) ch_malloc( sizeof(struct berval *) * (i+1) );
+
+ for ( i=0, j=0; attr->a_vals[i] != NULL; i++ ) {
+ if( conn != NULL
+ && op != NULL
+ && access_allowed(be, conn, op, e, entry_at,
+ attr->a_vals[i], ACL_READ) == 0)
+ {
+ continue;
}
+ v[j] = ber_bvdup( attr->a_vals[i] );
+
+ if( v[j] != NULL ) j++;
+ }
+
+ if( j == 0 ) {
+ ch_free( v );
+ *vals = NULL;
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ } else {
v[j] = NULL;
*vals = v;
+ rc = LDAP_SUCCESS;
}
- rc = 0;
-
return_results:
if( target != e ) {
/* free entry and reader lock */
- cache_return_entry_r( &li->li_cache, e );
+ cache_return_entry_r( &li->li_cache, e );
}
- Debug( LDAP_DEBUG_TRACE, "ldbm_back_attribute: rc=%d\n", rc, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "ldbm_back_attribute: rc=%d nvals=%d.\n",
+ rc, j ));
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_back_attribute: rc=%d nvals=%d\n",
+ rc, j, 0 );
+#endif
+
return(rc);
}
projects / openldap / blobdiff