New backend routine: back_attribute

diff --git a/servers/slapd/back-dnssrv/init.c b/servers/slapd/back-dnssrv/init.c
index d2c44b4d3054ca9f6746d211913b98da36ec789b..d1e0091d86108c267980d53a151224bcb38eeade 100644 (file)
--- a/servers/slapd/back-dnssrv/init.c
+++ b/servers/slapd/back-dnssrv/init.c
@@ -66,6 +66,7 @@ dnssrv_back_initialize(
 
        bi->bi_extended = 0;
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
 
 #ifdef HAVE_CYRUS_SASL
        bi->bi_sasl_authorize = 0;

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index f18d3acb17da3feb5ff9768ef512a1099d59d5a6..ac306acef0e0183c48b1b3b107c632da49a06377 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -75,6 +75,7 @@ ldap_back_initialize(
        bi->bi_extended = 0;
 
        bi->bi_acl_group = ldap_back_group;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
 #ifdef HAVE_CYRUS_SASL

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
new file mode 100644 (file)
index 0000000..b17092d
--- /dev/null
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -0,0 +1,138 @@
+/* attribute.c - ldbm backend acl attribute routine */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+
+#include "slap.h"
+#include "back-ldbm.h"
+#include "proto-back-ldbm.h"
+
+
+/* return 0 IFF we can retrieve the attributes
+ * of entry with e_ndn
+ */
+int
+ldbm_back_attribute(
+       Backend *be,
+       Connection *conn,
+       Operation *op,
+       Entry   *target,
+       const char      *e_ndn,
+       AttributeDescription *entry_at,
+       const char ***vals
+)
+{
+       struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
+       Entry        *e;
+       int          i, j, rc = 1;
+       Attribute   *attr;
+       struct berval **abv;
+       char *s, **v;
+       const char *entry_at_name = entry_at->ad_cname->bv_val;
+
+       Debug( LDAP_DEBUG_ARGS,
+               "=> ldbm_back_attribute: gr dn: \"%s\"\n",
+               e_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 ); 
+
+       if (target != NULL && strcmp(target->e_ndn, e_ndn) == 0) {
+               /* we already have a LOCKED copy of the entry */
+               e = target;
+               Debug( LDAP_DEBUG_ARGS,
+                       "=> ldbm_back_attribute: target is entry: \"%s\"\n",
+                       e_ndn, 0, 0 );
+
+       } else {
+               /* can we find entry with reader lock */
+               if ((e = dn2entry_r(be, e_ndn, NULL )) == NULL) {
+                       Debug( LDAP_DEBUG_ACL,
+                               "=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
+                                       e_ndn, 0, 0 ); 
+                       return( 1 );
+               }
+               
+               Debug( LDAP_DEBUG_ACL,
+                       "=> ldbm_back_attribute: found entry: \"%s\"\n",
+                       e_ndn, 0, 0 ); 
+    }
+
+       rc = 1;
+
+       /* find attribute values
+        */
+        
+       if( is_entry_alias( e ) ) {
+               Debug( LDAP_DEBUG_ACL,
+                       "<= ldbm_back_attribute: entry is an alias\n", 0, 0, 0 );
+               goto return_results;
+       }
+
+       if( is_entry_referral( e ) ) {
+               Debug( LDAP_DEBUG_ACL,
+                       "<= ldbm_back_attribute: entry is an referral\n", 0, 0, 0 );
+               goto return_results;
+       }
+
+       if (conn != NULL && op != NULL
+               && access_allowed(be, conn, op, e, slap_schema.si_ad_entry, NULL, ACL_SEARCH) == 0)
+       {
+               goto return_results;
+       }
+
+       if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
+               Debug( LDAP_DEBUG_ACL,
+                       "<= ldbm_back_attribute: failed to find %s\n",
+                       entry_at_name, 0, 0 ); 
+               goto return_results;
+       }
+
+       if (conn != NULL && op != NULL
+               && access_allowed(be, conn, op, e, entry_at, NULL, ACL_SEARCH) == 0)
+       {
+               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;
+                       }
+               }
+               v[j] = NULL;
+               *vals = v;
+       }
+
+       rc = 0;
+
+return_results:
+       if( target != e ) {
+               /* free entry and reader lock */
+               cache_return_entry_r( &li->li_cache, e );                 
+       }
+
+       Debug( LDAP_DEBUG_TRACE, "ldbm_back_attribute: rc=%d\n", rc, 0, 0 ); 
+       return(rc);
+}
+

diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c
index ccaeae6843bc4c3e0a44db5f43aede6c9d694a39..accff0551adb9e09cc4c04309f92fe3878256985 100644 (file)
--- a/servers/slapd/back-passwd/init.c
+++ b/servers/slapd/back-passwd/init.c
@@ -54,6 +54,7 @@ passwd_back_initialize(
        bi->bi_extended = 0;
 
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
 #ifdef HAVE_CYRUS_SASL

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index b2175acf59ce9f8c7ddacb21e84e180f4e056166..e2201c2b380b3f19b9cdc3faedf7cd8ed66501ea 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -97,6 +97,7 @@ perl_back_initialize(
        bi->bi_extended = 0;
 
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
 #ifdef HAVE_CYRUS_SASL

diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index d0de95129b4c9ae978c9e52681092a97484a9045..b05b029132254129333f1d81462cbf2e57c47f6f 100644 (file)
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -58,6 +58,7 @@ shell_back_initialize(
        bi->bi_extended = 0;
 
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
 #ifdef HAVE_CYRUS_SASL

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 3f82e238f651b9ad6b1223d0085e75e37d3b4066..8c58f1b27c619083847e42293db1ccf3c096ee75 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -66,6 +66,7 @@ int sql_back_initialize(
        bi->bi_op_delete = backsql_delete;
        
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
  
        bi->bi_connection_init = 0;

diff --git a/servers/slapd/back-tcl/tcl_init.c b/servers/slapd/back-tcl/tcl_init.c
index 8a2905f245b35935d12afedf9f3b701c9023ea56..b35f0f750f6ffc2762e3bedac5fb94d35a16805c 100644 (file)
--- a/servers/slapd/back-tcl/tcl_init.c
+++ b/servers/slapd/back-tcl/tcl_init.c
@@ -73,6 +73,7 @@ tcl_back_initialize (
        bi->bi_op_abandon = tcl_back_abandon;
 
        bi->bi_acl_group = 0;
+       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
        bi->bi_connection_init = 0;