place old schema codes behind -DSLAPD_SCHEMA_COMPAT

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 7e8a1cf327caebe660b2169e5130432310e776b7..9aa6568a60b74c7114b5b6d75a4c268c1b55b687 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -17,8 +18,6 @@
 #include "slap.h"
 #include "lutil.h"
 
-#include "ldap_defaults.h"
-
 #ifdef SLAPD_LDAP
 #include "back-ldap/external.h"
 #endif
@@ -40,6 +39,9 @@
 #ifdef SLAPD_TCL
 #include "back-tcl/external.h"
 #endif
+#ifdef SLAPD_NTDOMAIN
+#include "back-domain/external.h"
+#endif
 
 static BackendInfo binfo[] = {
 #if defined(SLAPD_LDAP) && !defined(SLAPD_LDAP_DYNAMIC)
@@ -60,8 +62,11 @@ static BackendInfo binfo[] = {
 #if defined(SLAPD_SHELL) && !defined(SLAPD_SHELL_DYNAMIC)
        {"shell",       shell_back_initialize},
 #endif
-#if defined(SLAPD_TCL) && !defined(SLAPD_LDAP_TCL)
+#if defined(SLAPD_TCL) && !defined(SLAPD_TCL_DYNAMIC)
        {"tcl",         tcl_back_initialize},
+#endif
+#if defined(SLAPD_NTDOMAIN) && !defined(SLAPD_NTDOMAIN_DYNAMIC)
+       {"ntdom",       domain_back_initialize},
 #endif
        {NULL}
 };
@@ -223,6 +228,9 @@ int backend_startup(Backend *be)
 
        /* open each backend database */
        for( i = 0; i < nBackendDB; i++ ) {
+               /* append global access controls */
+               acl_append( &backendDB[i].be_acl, global_acl );
+
                if ( backendDB[i].bd_info->bi_db_open ) {
                        rc = backendDB[i].bd_info->bi_db_open(
                                &backendDB[i] );
@@ -277,8 +285,6 @@ int backend_shutdown( Backend *be )
 
        /* close each backend database */
        for( i = 0; i < nBackendDB; i++ ) {
-               BackendInfo  *bi;
-
                if ( backendDB[i].bd_info->bi_db_close ) {
                        backendDB[i].bd_info->bi_db_close(
                                &backendDB[i] );
@@ -287,7 +293,7 @@ int backend_shutdown( Backend *be )
                if(rc != 0) {
                        Debug( LDAP_DEBUG_ANY,
                                "backend_close: bi_close %s failed!\n",
-                               bi->bi_type, 0, 0 );
+                               backendDB[i].be_type, 0, 0 );
                }
        }
 
@@ -339,7 +345,7 @@ int backend_destroy(void)
        return 0;
 }
 
-BackendInfo* backend_info(char *type)
+BackendInfo* backend_info(const char *type)
 {
        int i;
 
@@ -356,7 +362,7 @@ BackendInfo* backend_info(char *type)
 
 BackendDB *
 backend_db_init(
-    char       *type
+    const char *type
 )
 {
        Backend *be;
@@ -379,6 +385,10 @@ backend_db_init(
        be->bd_info = bi;
        be->be_sizelimit = defsize;
        be->be_timelimit = deftime;
+       be->be_dfltaccess = global_default_access;
+
+       /* assign a default depth limit for alias deref */
+       be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
 
        be->be_realm = global_realm != NULL
                ? ch_strdup( global_realm ) : NULL;
@@ -410,7 +420,7 @@ be_db_close( void )
 }
 
 Backend *
-select_backend( char * dn )
+select_backend( const char * dn )
 {
        int     i, j, len, dnlen;
 
@@ -452,7 +462,7 @@ select_backend( char * dn )
 int
 be_issuffix(
     Backend    *be,
-    char       *suffix
+    const char *suffix
 )
 {
        int     i;
@@ -467,7 +477,7 @@ be_issuffix(
 }
 
 int
-be_isroot( Backend *be, char *ndn )
+be_isroot( Backend *be, const char *ndn )
 {
        int rc;
 
@@ -491,19 +501,23 @@ be_root_dn( Backend *be )
 }
 
 int
-be_isroot_pw( Backend *be, char *ndn, struct berval *cred )
+be_isroot_pw( Backend *be, const char *ndn, struct berval *cred )
 {
        int result;
 
        if ( ! be_isroot( be, ndn ) ) {
-               return( 0 );
+               return 0;
+       }
+
+       if( be->be_root_pw.bv_len == 0 ) {
+               return 0;
        }
 
 #ifdef SLAPD_CRYPT
        ldap_pvt_thread_mutex_lock( &crypt_mutex );
 #endif
 
-       result = lutil_passwd( cred->bv_val, be->be_root_pw, NULL );
+       result = lutil_passwd( &be->be_root_pw, cred, NULL );
 
 #ifdef SLAPD_CRYPT
        ldap_pvt_thread_mutex_unlock( &crypt_mutex );
@@ -574,14 +588,37 @@ backend_connection_destroy(
        return 0;
 }
 
+int
+backend_check_controls(
+       Backend *be,
+       Connection *conn,
+       Operation *op )
+{
+       LDAPControl **ctrls;
+       ctrls = op->o_ctrls;
+       if( ctrls == NULL ) {
+               return LDAP_SUCCESS;
+       }
+
+       for( ; *ctrls != NULL ; ctrls++ ) {
+               if( (*ctrls)->ldctl_iscritical &&
+                       !charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
+               {
+                       return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+               }
+       }
+
+       return LDAP_SUCCESS;
+}
+
 int 
 backend_group(
        Backend *be,
        Entry   *target,
-       char    *gr_ndn,
-       char    *op_ndn,
-       char    *objectclassValue,
-       char    *groupattrName
+       const char      *gr_ndn,
+       const char      *op_ndn,
+       const char      *objectclassValue,
+       const char      *groupattrName
 )
 {
        if (be->be_group)
@@ -594,7 +631,11 @@ backend_group(
 #ifdef SLAPD_SCHEMA_DN
 Attribute *backend_subschemasubentry( Backend *be )
 {
+       /*
+        * This routine returns points to STATIC data!!!
+        */
        /* should be backend specific */
+
        static struct berval ss_val = {
                sizeof(SLAPD_SCHEMA_DN)-1,
                SLAPD_SCHEMA_DN };
@@ -602,7 +643,9 @@ Attribute *backend_subschemasubentry( Backend *be )
        static Attribute ss_attr = {
                "subschemasubentry",
                ss_vals,
+#ifdef SLAPD_SCHEMA_COMPAT
                SYNTAX_DN | SYNTAX_CIS,
+#endif
                NULL
        };