Change recover logic

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 7d7414aaa831a3a9d1eaaf7e2c41aa7e73039d3c..133f9fd82e8c52b57c9cd87e4ccb706490135038 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -124,8 +124,8 @@ int backend_init(void)
        if((nBackendInfo != 0) || (backendInfo != NULL)) {
                /* already initialized */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "backend_init:  backend already initialized\n" ));
+               LDAP_LOG( BACKEND, ERR, 
+                       "backend_init:  backend already initialized\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "backend_init: already initialized.\n", 0, 0, 0 );
@@ -141,9 +141,9 @@ int backend_init(void)
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                       LDAP_LOG( BACKEND, INFO, 
                                "backend_init:  initialized for type \"%s\"\n",
-                               binfo[nBackendInfo].bi_type ));
+                               binfo[nBackendInfo].bi_type, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_init: initialized for type \"%s\"\n",
@@ -173,8 +173,7 @@ int backend_init(void)
 #else
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-               "backend_init: failed\n" ));
+       LDAP_LOG( BACKEND, ERR, "backend_init: failed\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "backend_init: failed\n",
@@ -191,9 +190,9 @@ int backend_add(BackendInfo *aBackendInfo)
 
    if ((rc = aBackendInfo->bi_init(aBackendInfo)) != 0) {
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+               LDAP_LOG( BACKEND, ERR, 
                   "backend_add:  initialization for type \"%s\" failed\n",
-                  aBackendInfo->bi_type ));
+                  aBackendInfo->bi_type, 0, 0 );
 #else
       Debug( LDAP_DEBUG_ANY,
             "backend_add: initialization for type \"%s\" failed\n",
@@ -232,9 +231,8 @@ int backend_startup(Backend *be)
        if( ! ( nBackendDB > 0 ) ) {
                /* no databases */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "backend_startup: %d databases to startup. \n",
-                          nBackendDB ));
+               LDAP_LOG( BACKEND, INFO, 
+                       "backend_startup: %d databases to startup. \n", nBackendDB, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "backend_startup: %d databases to startup.\n",
@@ -246,9 +244,8 @@ int backend_startup(Backend *be)
        if(be != NULL) {
                /* startup a specific backend database */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "backend_startup:  starting \"%s\"\n",
-                          be->be_suffix[0].bv_val ));
+               LDAP_LOG( BACKEND, DETAIL1, "backend_startup:  starting \"%s\"\n",
+                          be->be_suffix[0].bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "backend_startup: starting \"%s\"\n",
@@ -261,8 +258,7 @@ int backend_startup(Backend *be)
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-                                  "backend_startup: bi_open failed!\n" ));
+                       LDAP_LOG( BACKEND, CRIT, "backend_startup: bi_open failed!\n", 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_open failed!\n",
@@ -278,8 +274,8 @@ int backend_startup(Backend *be)
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-                               "backend_startup: bi_db_open failed! (%d)\n", rc ));
+                       LDAP_LOG( BACKEND, CRIT, 
+                               "backend_startup: bi_db_open failed! (%d)\n", rc, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open failed! (%d)\n",
@@ -305,8 +301,8 @@ int backend_startup(Backend *be)
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-                                  "backend_startup: bi_open %d failed!\n", i ));
+                       LDAP_LOG( BACKEND, CRIT, 
+                               "backend_startup: bi_open %d failed!\n", i, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_open %d failed!\n",
@@ -328,9 +324,8 @@ int backend_startup(Backend *be)
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-                               "backend_startup: bi_db_open(%d) failed! (%d)\n",
-                               i, rc ));
+                       LDAP_LOG( BACKEND, CRIT, 
+                               "backend_startup: bi_db_open(%d) failed! (%d)\n", i, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open(%d) failed! (%d)\n",
@@ -388,9 +383,9 @@ int backend_shutdown( Backend *be )
 
                if(rc != 0) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_NOTICE,
-                                  "backend_shutdown: bi_close %s failed!\n",
-                                  backendDB[i].be_type ));
+                       LDAP_LOG( BACKEND, NOTICE, 
+                               "backend_shutdown: bi_close %s failed!\n",
+                               backendDB[i].be_type, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_close: bi_close %s failed!\n",
@@ -914,7 +909,7 @@ backend_check_restrictions(
 
                        if( op->o_ndn.bv_len == 0 ) {
                                *text = "modifications require authentication";
-                               return LDAP_OPERATIONS_ERROR;
+                               return LDAP_STRONG_AUTH_REQUIRED;
                        }
                }
        }
@@ -924,7 +919,8 @@ backend_check_restrictions(
 
                if( requires & SLAP_REQUIRE_STRONG ) {
                        /* should check mechanism */
-                       if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
+                       if( ( op->o_transport_ssf < ssf->sss_transport
+                               && op->o_authmech.bv_len == 0 ) || op->o_dn.bv_len == 0 )
                        {
                                *text = "strong authentication required";
                                return LDAP_STRONG_AUTH_REQUIRED;
@@ -932,8 +928,7 @@ backend_check_restrictions(
                }
 
                if( requires & SLAP_REQUIRE_SASL ) {
-                       if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
-                       {
+                       if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 ) {
                                *text = "SASL authentication required";
                                return LDAP_STRONG_AUTH_REQUIRED;
                        }
@@ -1031,6 +1026,7 @@ backend_group(
        } 
 
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+
        for (g = conn->c_groups; g; g=g->ga_next) {
                if (g->ga_be != be || g->ga_oc != group_oc ||
                        g->ga_at != group_at || g->ga_len != gr_ndn->bv_len)
@@ -1038,7 +1034,9 @@ backend_group(
                if (strcmp( g->ga_ndn, gr_ndn->bv_val ) == 0)
                        break;
        }
+
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
        if (g) {
                return g->ga_res;
        }
@@ -1048,7 +1046,7 @@ backend_group(
                        target, gr_ndn, op_ndn,
                        group_oc, group_at );
                
-               if (op->o_tag != LDAP_REQ_BIND) {
+               if ( op->o_tag != LDAP_REQ_BIND && !op->o_do_not_cache ) {
                        g = ch_malloc(sizeof(GroupAssertion) + gr_ndn->bv_len);
                        g->ga_be = be;
                        g->ga_oc = group_oc;
@@ -1107,16 +1105,18 @@ Attribute *backend_operational(
 {
        Attribute *a = NULL, **ap = &a;
 
-#ifdef SLAPD_SCHEMA_DN
-       *ap = slap_operational_subschemaSubentry();
-       ap = &(*ap)->a_next;
-#endif
-
        /*
         * If operational attributes (allegedly) are required, 
         * and the backend supports specific operational attributes, 
         * add them to the attribute list
         */
+#ifdef SLAPD_SCHEMA_DN
+       if ( opattrs || ( attrs &&
+               ad_inlist( slap_schema.si_ad_subschemaSubentry, attrs )) ) {
+               *ap = slap_operational_subschemaSubentry();
+               ap = &(*ap)->a_next;
+       }
+#endif
        if ( ( opattrs || attrs ) && be && be->be_operational != NULL ) {
                ( void )be->be_operational( be, conn, op, e, attrs, opattrs, ap );
        }