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 0790b62164f9476e069d1387164f05d10ae14d09..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
@@ -38,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)
@@ -58,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}
 };
@@ -221,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] );
@@ -375,6 +385,7 @@ 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; 
@@ -495,14 +506,18 @@ 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 );
@@ -573,6 +588,29 @@ 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,
@@ -593,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 };
@@ -601,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
        };