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

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

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index 4d60f68d0e83030029b78329c7c41b3424ea4b3f..1ecbf1dddce1b3c1f16c867836c8e67adf61914c 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -39,7 +39,13 @@ bdb_referrals(
                return rc;
        } 
 
-       LOCK_ID ( bdb->bi_dbenv, &locker );
+       rc = LOCK_ID(bdb->bi_dbenv, &locker);
+       switch(rc) {
+       case 0:
+               break;
+       default:
+               return LDAP_OTHER;
+       }
 
 dn2entry_retry:
        /* get entry */
@@ -66,9 +72,9 @@ dn2entry_retry:
                goto dn2entry_retry;
        default:
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "referral", LDAP_LEVEL_ERR,
-                       "bdb_referrals: dn2entry failed: %s (%d)\n",
-                       db_strerror(rc), rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_referrals: dn2entry failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_referrals: dn2entry failed: %s (%d)\n",
@@ -94,9 +100,9 @@ dn2entry_retry:
                        matched_dn = ch_strdup( matched->e_dn );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "referral", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG ( OPERATION, DETAIL1, 
                        "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
-                       (long) op->o_tag, dn->bv_val, matched_dn ));
+                       (long) op->o_tag, dn->bv_val, matched_dn );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
@@ -139,9 +145,9 @@ dn2entry_retry:
                        refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "referral", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG ( OPERATION, DETAIL1, 
                        "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
-                       (long) op->o_tag, dn->bv_val, e->e_dn ));
+                       (long) op->o_tag, dn->bv_val, e->e_dn );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",