Clean up include logging

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index d05df370751cacf6fbea63c59f02fed5652021f8..105e95b75cdf803408475df0b23cc30d9c4a2504 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -30,6 +30,12 @@
 #ifdef SLAPD_LDBM
 #include "back-ldbm/external.h"
 #endif
+#ifdef SLAPD_META
+#include "back-meta/external.h"
+#endif
+#ifdef SLAPD_MONITOR
+#include "back-monitor/external.h"
+#endif
 #ifdef SLAPD_PASSWD
 #include "back-passwd/external.h"
 #endif
@@ -62,6 +68,12 @@ static BackendInfo binfo[] = {
 #if defined(SLAPD_LDBM) && !defined(SLAPD_LDBM_DYNAMIC)
        {"ldbm",        ldbm_back_initialize},
 #endif
+#if defined(SLAPD_META) && !defined(SLAPD_META_DYNAMIC)
+       {"meta",        meta_back_initialize},
+#endif
+#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC)
+       {"monitor",     monitor_back_initialize},
+#endif
 #if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC)
        {"passwd",      passwd_back_initialize},
 #endif
@@ -96,8 +108,13 @@ 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" ));
+#else
                Debug( LDAP_DEBUG_ANY,
                        "backend_init: already initialized.\n", 0, 0, 0 );
+#endif
                return -1;
        }
 
@@ -108,10 +125,15 @@ int backend_init(void)
                rc = binfo[nBackendInfo].bi_init( &binfo[nBackendInfo] );
 
                if(rc != 0) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                                  "backend_init:  initialized for type \"%s\"\n",
+                                  binfo[nBackendInfo].bi_type ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_init: initialized for type \"%s\"\n",
                                        binfo[nBackendInfo].bi_type, 0, 0 );
-
+#endif
                        /* destroy those we've already inited */
                        for( nBackendInfo--;
                                nBackendInfo >= 0 ;
@@ -134,9 +156,15 @@ int backend_init(void)
 #ifdef SLAPD_MODULES   
        return 0;
 #else
-       Debug( LDAP_DEBUG_ANY,
+
+#ifdef NEW_LOGGING
+        LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                   "backend_init: failed\n" ));
+#else
+        Debug( LDAP_DEBUG_ANY,
                "backend_init: failed\n",
                0, 0, 0 );
+#endif
 
        return rc;
 #endif /* SLAPD_MODULES */
@@ -147,9 +175,15 @@ int backend_add(BackendInfo *aBackendInfo)
    int rc = 0;
 
    if ((rc = aBackendInfo->bi_init(aBackendInfo)) != 0) {
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                  "backend_add:  initialization for type \"%s\" failed\n",
+                  aBackendInfo->bi_type ));
+#else
       Debug( LDAP_DEBUG_ANY,
             "backend_add: initialization for type \"%s\" failed\n",
             aBackendInfo->bi_type, 0, 0 );
+#endif
       return rc;
    }
 
@@ -182,26 +216,44 @@ 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 ));
+#else
                Debug( LDAP_DEBUG_ANY,
                        "backend_startup: %d databases to startup.\n",
                        nBackendDB, 0, 0 );
+#endif
                return 1;
        }
 
        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] ));
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "backend_startup: starting \"%s\"\n",
                        be->be_suffix[0], 0, 0 );
+#endif
 
                if ( be->bd_info->bi_open ) {
                        rc = be->bd_info->bi_open( be->bd_info );
                }
 
                if(rc != 0) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
+                                  "backend_startup: bi_open failed!\n" ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_open failed!\n",
                                0, 0, 0 );
+#endif
+
                        return rc;
                }
 
@@ -210,9 +262,14 @@ int backend_startup(Backend *be)
                }
 
                if(rc != 0) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
+                                  "backend_startup: bi_db_open failed!\n" ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open failed!\n",
                                0, 0, 0 );
+#endif
                        return rc;
                }
 
@@ -232,9 +289,14 @@ 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 ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_open %d failed!\n",
                                i, 0, 0 );
+#endif
                        return rc;
                }
        }
@@ -250,9 +312,14 @@ int backend_startup(Backend *be)
                }
 
                if(rc != 0) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
+                                  "backend_startup: bi_db_open %d failed!\n", i ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open %d failed!\n",
                                i, 0, 0 );
+#endif
                        return rc;
                }
        }
@@ -304,9 +371,15 @@ 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 ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_close: bi_close %s failed!\n",
                                backendDB[i].be_type, 0, 0 );
+#endif
                }
        }
 
@@ -396,8 +469,7 @@ backend_db_init(
        be = &backends[nbackends++];
 
        be->bd_info = bi;
-       be->be_sizelimit = defsize;
-       be->be_timelimit = deftime;
+       be->be_def_limit = deflimit;
        be->be_dfltaccess = global_default_access;
 
        be->be_restrictops = global_restrictops;
@@ -448,12 +520,18 @@ select_backend(
                        len = strlen( backends[i].be_nsuffix[j] );
 
                        if ( len > dnlen ) {
+                               /* suffix is longer than DN */
                                continue;
                        }
 
-                       if ( strcmp( backends[i].be_nsuffix[j],
-                           dn + (dnlen - len) ) == 0 )
-                       {
+                       
+                       if ( len && len < dnlen && !DN_SEPARATOR( dn[(dnlen-len)-1] ) ) {
+                               /* make sure we have a separator */
+                               continue;
+                       }
+                       
+
+                       if ( strcmp( backends[i].be_nsuffix[j], &dn[dnlen-len] ) == 0 ) {
                                if( be == NULL ) {
                                        be = &backends[i];
 
@@ -648,7 +726,7 @@ backend_check_restrictions(
        Backend *be,
        Connection *conn,
        Operation *op,
-       const char *extoid,
+       const void *opdata,
        const char **text )
 {
        int rc;
@@ -712,7 +790,9 @@ backend_check_restrictions(
                return LDAP_OTHER;
        }
 
-       if (( extoid == NULL || strcmp( extoid, LDAP_EXOP_START_TLS ) ) ) {
+       if ( op->o_tag != LDAP_REQ_EXTENDED
+               || strcmp( (const char *) opdata, LDAP_EXOP_START_TLS ) )
+       {
                /* these checks don't apply to StartTLS */
 
                if( op->o_tag == LDAP_REQ_EXTENDED ) {
@@ -720,47 +800,62 @@ backend_check_restrictions(
                        updateop++;
                }
 
-               if( op->o_ssf < ssf->sss_ssf ) {
-                       *text = "confidentiality required";
-                       return LDAP_CONFIDENTIALITY_REQUIRED;
-               }
                if( op->o_transport_ssf < ssf->sss_transport ) {
                        *text = "transport confidentiality required";
                        return LDAP_CONFIDENTIALITY_REQUIRED;
                }
+
                if( op->o_tls_ssf < ssf->sss_tls ) {
                        *text = "TLS confidentiality required";
                        return LDAP_CONFIDENTIALITY_REQUIRED;
                }
-               if( op->o_sasl_ssf < ssf->sss_sasl ) {
-                       *text = "SASL confidentiality required";
-                       return LDAP_CONFIDENTIALITY_REQUIRED;
-               }
 
-               if( updateop ) {
-                       if( op->o_ssf < ssf->sss_update_ssf ) {
-                               *text = "update confidentiality required";
+               if( op->o_tag != LDAP_REQ_BIND || opdata == NULL ) {
+                       /* these checks don't apply to SASL bind */
+
+                       if( op->o_sasl_ssf < ssf->sss_sasl ) {
+                               *text = "SASL confidentiality required";
+                               return LDAP_CONFIDENTIALITY_REQUIRED;
+                       }
+
+                       if( op->o_ssf < ssf->sss_ssf ) {
+                               *text = "confidentiality required";
                                return LDAP_CONFIDENTIALITY_REQUIRED;
                        }
+               }
+
+               if( updateop ) {
                        if( op->o_transport_ssf < ssf->sss_update_transport ) {
                                *text = "transport update confidentiality required";
                                return LDAP_CONFIDENTIALITY_REQUIRED;
                        }
+
                        if( op->o_tls_ssf < ssf->sss_update_tls ) {
                                *text = "TLS update confidentiality required";
                                return LDAP_CONFIDENTIALITY_REQUIRED;
                        }
+
                        if( op->o_sasl_ssf < ssf->sss_update_sasl ) {
                                *text = "SASL update confidentiality required";
                                return LDAP_CONFIDENTIALITY_REQUIRED;
                        }
+
+                       if( op->o_ssf < ssf->sss_update_ssf ) {
+                               *text = "update confidentiality required";
+                               return LDAP_CONFIDENTIALITY_REQUIRED;
+                       }
+
+                       if( op->o_ndn == NULL ) {
+                               *text = "modifications require authentication";
+                               return LDAP_OPERATIONS_ERROR;
+                       }
                }
        }
 
-       if (( extoid == NULL || strcmp( extoid, LDAP_EXOP_START_TLS ) )
-               || op->o_tag == LDAP_REQ_BIND )
+       if ( op->o_tag != LDAP_REQ_BIND && ( op->o_tag != LDAP_REQ_EXTENDED ||
+               strcmp( (const char *) opdata, LDAP_EXOP_START_TLS ) ) )
        {
-               /* these checks don't apply to StartTLS or Bind */
+               /* these checks don't apply to Bind or StartTLS */
 
                if( requires & SLAP_REQUIRE_STRONG ) {
                        /* should check mechanism */