Add start of discussion of strings in LDAP/X.500 and OpenLDAP.

[openldap] / servers / slapd / back-ldbm / group.c

diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index 476ce38a59e70a8b1339261deb5608834dda5865..f8d5074bc8ff5dba34a8977ffe077b7a5fe9f6f3 100644 (file)
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -1,7 +1,7 @@
 /* group.c - ldbm backend acl group routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -27,8 +27,8 @@ ldbm_back_group(
        Connection *conn,
        Operation *op,
        Entry   *target,
-       const char      *gr_ndn,
-       const char      *op_ndn,
+       struct berval   *gr_ndn,
+       struct berval   *op_ndn,
        ObjectClass *group_oc,
        AttributeDescription *group_at
 )
@@ -37,7 +37,6 @@ ldbm_back_group(
        Entry        *e;
        int          rc = 1;
        Attribute   *attr;
-       struct berval bv;
 
        const char *group_oc_name = NULL;
        const char *group_at_name = group_at->ad_cname.bv_val;
@@ -49,17 +48,17 @@ ldbm_back_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "ldbm_back_group: check (%s) member of (%s), oc %s\n",
-                  op_ndn, gr_ndn, group_oc_name ));
+       LDAP_LOG( BACK_LDBM, ENTRY, 
+               "ldbm_back_group: check (%s) member of (%s), oc %s\n",
+               op_ndn->bv_val, gr_ndn->bv_val, group_oc_name );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_group: gr dn: \"%s\"\n",
-               gr_ndn, 0, 0 ); 
+               gr_ndn->bv_val, 0, 0 ); 
 
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_group: op dn: \"%s\"\n",
-               op_ndn, 0, 0 ); 
+               op_ndn->bv_val, 0, 0 ); 
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_group: oc: \"%s\" at: \"%s\"\n", 
                group_oc_name, group_at_name, 0 ); 
@@ -69,16 +68,16 @@ ldbm_back_group(
                target->e_ndn, 0, 0 ); 
 #endif
 
-       if (strcmp(target->e_ndn, gr_ndn) == 0) {
+       if (dn_match(&target->e_nname, gr_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "ldbm_back_group: target is group (%s)\n", gr_ndn ));
+               LDAP_LOG( BACK_LDBM, DETAIL1, 
+                       "ldbm_back_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "=> ldbm_back_group: target is group: \"%s\"\n",
-                       gr_ndn, 0, 0 );
+                       gr_ndn->bv_val, 0, 0 );
 #endif
 
 
@@ -86,25 +85,25 @@ ldbm_back_group(
                /* can we find group entry with reader lock */
                if ((e = dn2entry_r(be, gr_ndn, NULL )) == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                  "ldbm_back_group: cannot find group (%s)\n",
-                                  gr_ndn ));
+                       LDAP_LOG( BACK_LDBM, DETAIL1, 
+                               "ldbm_back_group: cannot find group (%s)\n", 
+                               gr_ndn->bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> ldbm_back_group: cannot find group: \"%s\"\n",
-                                       gr_ndn, 0, 0 ); 
+                               gr_ndn->bv_val, 0, 0 ); 
 #endif
 
                        return( 1 );
                }
                
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "ldbm_back_group: found group (%s)\n", gr_ndn ));
+               LDAP_LOG( BACK_LDBM, DETAIL1, 
+                       "ldbm_back_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "=> ldbm_back_group: found group: \"%s\"\n",
-                       gr_ndn, 0, 0 ); 
+                       gr_ndn->bv_val, 0, 0 ); 
 #endif
 
     }
@@ -119,8 +118,8 @@ ldbm_back_group(
        
        if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_group: group (%s) is an alias\n", gr_ndn ));
+               LDAP_LOG( BACK_LDBM, INFO, 
+                       "ldbm_back_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_group: group is an alias\n", 0, 0, 0 );
@@ -131,8 +130,8 @@ ldbm_back_group(
 
        if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_group: group (%s) is a referral.\n", gr_ndn ));
+               LDAP_LOG( BACK_LDBM, INFO, 
+                       "ldbm_back_group: group (%s) is a referral.\n", gr_ndn->bv_val,0,0);
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_group: group is an referral\n", 0, 0, 0 );
@@ -141,11 +140,11 @@ ldbm_back_group(
                goto return_results;
        }
 
-       if( !is_entry_objectclass( e, group_oc ) ) {
+       if( !is_entry_objectclass( e, group_oc, 0 ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "ldbm_back_group: failed to find %s in objectClass.\n",
-                          group_oc_name ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                       "ldbm_back_group: failed to find %s in objectClass.\n",
+                       group_oc_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_group: failed to find %s in objectClass\n", 
@@ -157,8 +156,8 @@ ldbm_back_group(
 
        if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_group: failed to find %s\n", group_at_name ));
+               LDAP_LOG( BACK_LDBM, INFO, 
+                       "ldbm_back_group: failed to find %s\n", group_at_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_group: failed to find %s\n",
@@ -169,9 +168,9 @@ ldbm_back_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( BACK_LDBM, ENTRY, 
                   "ldbm_back_group: found objectClass %s and %s\n",
-                  group_oc_name, group_at_name ));
+                  group_oc_name, group_at_name, 0 );
 #else
        Debug( LDAP_DEBUG_ACL,
                "<= ldbm_back_group: found objectClass %s and %s\n",
@@ -179,33 +178,29 @@ ldbm_back_group(
 #endif
 
 
-       bv.bv_val = (char *) op_ndn;
-       bv.bv_len = strlen( op_ndn );         
-
-       if( value_find( group_at, attr->a_vals, &bv ) != LDAP_SUCCESS ) {
+       if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "ldbm_back_group: \"%s\" not in \"%s\": %s\n",
-                          op_ndn, gr_ndn, group_at_name ));
+               LDAP_LOG( BACK_LDBM, DETAIL1, 
+                       "ldbm_back_group: \"%s\" not in \"%s\": %s\n",
+                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= ldbm_back_group: \"%s\" not in \"%s\": %s\n", 
-                       op_ndn, gr_ndn, group_at_name ); 
+                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); 
 #endif
 
                goto return_results;
        }
 
 
-
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                  "ldbm_back_group: %s is in %s: %s\n",
-                  op_ndn, gr_ndn, group_at_name ));
+       LDAP_LOG( BACK_LDBM, DETAIL1, 
+               "ldbm_back_group: %s is in %s: %s\n",
+               op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
        Debug( LDAP_DEBUG_ACL,
                "<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", 
-               op_ndn, gr_ndn, group_at_name ); 
+               op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); 
 #endif
 
 
@@ -218,8 +213,7 @@ return_results:
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "ldbm_back_group: rc=%d\n", rc ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_group: rc=%d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: rc=%d\n", rc, 0, 0 ); 
 #endif