Add calls to module_init/module_kill to support dynamically loaded backends.

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

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 6c2cdf11330a3c7f9035248c16555a65ffa41101..20b768bbdb8c366af44cc8b773bcb89c4d071b1b 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -40,7 +40,6 @@ bdb_group(
        int     rc = 1;
        Attribute *attr;
 
-       AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
        const char *group_oc_name = NULL;
        const char *group_at_name = group_at->ad_cname.bv_val;
 
@@ -54,9 +53,9 @@ bdb_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( BACK_BDB, ENTRY, 
                "bdb_group: check (%s) member of (%s), oc %s\n",
-               op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
+               op_ndn->bv_val, gr_ndn->bv_val, group_oc_name );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> bdb_group: gr dn: \"%s\"\n",
@@ -79,17 +78,24 @@ bdb_group(
                txn = boi->boi_txn;
        }
 
-       if ( txn )
+       if ( txn ) {
                locker = TXN_ID( txn );
-       else
-               LOCK_ID ( bdb->bi_dbenv, &locker );
+       } else {
+               rc = LOCK_ID ( bdb->bi_dbenv, &locker );
+               switch(rc) {
+               case 0:
+                       break;
+               default:
+                       return 1;
+               }
+       }
 
        if (dn_match(&target->e_name, gr_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_group: target is group (%s)\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "=> bdb_group: target is group: \"%s\"\n",
@@ -112,9 +118,8 @@ dn2entry_retry:
                }
                if (e == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                               "bdb_group: cannot find group (%s)\n",
-                               gr_ndn->bv_val ));
+                       LDAP_LOG( BACK_BDB, DETAIL1, 
+                               "bdb_group: cannot find group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> bdb_group: cannot find group: \"%s\"\n",
@@ -126,8 +131,8 @@ dn2entry_retry:
                        return( 1 );
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_group: found group (%s)\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "=> bdb_group: found group: \"%s\"\n",
@@ -144,8 +149,8 @@ dn2entry_retry:
 #ifdef BDB_ALIASES
        if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: group (%s) is an alias\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0);
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: group is an alias\n", 0, 0, 0 );
@@ -156,8 +161,8 @@ dn2entry_retry:
 
        if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: group is a referral\n", 0, 0, 0 );
@@ -167,9 +172,9 @@ dn2entry_retry:
 
        if( !is_entry_objectclass( e, group_oc, 0 ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                       "bdb_group: failed to find %s in objectClass.\n",
-                       group_oc_name ));
+               LDAP_LOG( BACK_BDB, ERR, 
+                       "bdb_group: failed to find %s in objectClass.\n", 
+                       group_oc_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: failed to find %s in objectClass\n", 
@@ -180,8 +185,8 @@ dn2entry_retry:
 
        if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: failed to find %s\n", group_at_name ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: failed to find %s\n", group_at_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: failed to find %s\n",
@@ -191,9 +196,9 @@ dn2entry_retry:
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( BACK_BDB, ENTRY, 
                "bdb_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,
                "<= bdb_group: found objectClass %s and %s\n",
@@ -202,9 +207,9 @@ dn2entry_retry:
 
        if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( BACK_BDB, DETAIL1, 
                        "bdb_group: \"%s\" not in \"%s\": %s\n",
-                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
+                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: \"%s\" not in \"%s\": %s\n", 
@@ -214,9 +219,8 @@ dn2entry_retry:
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-               "bdb_group: %s is in %s: %s\n",
-               op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
+       LDAP_LOG( BACK_BDB, DETAIL1, "bdb_group: %s is in %s: %s\n",
+               op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
        Debug( LDAP_DEBUG_ACL,
                "<= bdb_group: \"%s\" is in \"%s\": %s\n", 
@@ -236,8 +240,7 @@ return_results:
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-               "bdb_group: rc=%d\n", rc ));
+       LDAP_LOG( BACK_BDB, ENTRY, "bdb_group: rc=%d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "bdb_group: rc=%d\n", rc, 0, 0 ); 
 #endif