Install *.schema only

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index d1a71cc491897d95866572383a44b9eb2e9b9a2c..e9f4c0e4de910a7aa3f96f547d0a8715f2cddf12 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* backend.c - routines for dealing with back-end databases */
@@ -18,6 +18,9 @@
 #include "slap.h"
 #include "lutil.h"
 
+#ifdef SLAPD_DNSSRV
+#include "back-dnssrv/external.h"
+#endif
 #ifdef SLAPD_LDAP
 #include "back-ldap/external.h"
 #endif
@@ -42,8 +45,14 @@
 #ifdef SLAPD_NTDOMAIN
 #include "back-domain/external.h"
 #endif
+#ifdef SLAPD_SQL
+#include "back-sql/external.h"
+#endif
 
 static BackendInfo binfo[] = {
+#if defined(SLAPD_DNSSRV) && !defined(SLAPD_DNSSRV_DYNAMIC)
+       {"dnssrv",      dnssrv_back_initialize},
+#endif
 #if defined(SLAPD_LDAP) && !defined(SLAPD_LDAP_DYNAMIC)
        {"ldap",        ldap_back_initialize},
 #endif
@@ -67,6 +76,9 @@ static BackendInfo binfo[] = {
 #endif
 #if defined(SLAPD_NTDOMAIN) && !defined(SLAPD_NTDOMAIN_DYNAMIC)
        {"ntdom",       domain_back_initialize},
+#endif
+#if defined(SLAPD_SQL) && !defined(SLAPD_SQL_DYNAMIC)
+       {"sql",         sql_back_initialize},
 #endif
        {NULL}
 };
@@ -481,7 +493,11 @@ be_isroot( Backend *be, const char *ndn )
 {
        int rc;
 
-       if ( ndn == NULL || be->be_root_ndn == NULL ) {
+       if ( ndn == NULL || *ndn == '\0' ) {
+               return( 0 );
+       }
+
+       if ( be->be_root_ndn == NULL || *be->be_root_ndn == '\0' ) {
                return( 0 );
        }
 
@@ -509,11 +525,15 @@ be_isroot_pw( Backend *be, const char *ndn, struct berval *cred )
                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( be->be_root_pw, cred->bv_val, NULL );
+       result = lutil_passwd( &be->be_root_pw, cred, NULL );
 
 #ifdef SLAPD_CRYPT
        ldap_pvt_thread_mutex_unlock( &crypt_mutex );
@@ -588,7 +608,8 @@ int
 backend_check_controls(
        Backend *be,
        Connection *conn,
-       Operation *op )
+       Operation *op,
+       const char **text )
 {
        LDAPControl **ctrls;
        ctrls = op->o_ctrls;
@@ -600,6 +621,7 @@ backend_check_controls(
                if( (*ctrls)->ldctl_iscritical &&
                        !charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
                {
+                       *text = "control unavailable in NamingContext";
                        return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
                }
        }
@@ -613,32 +635,42 @@ backend_group(
        Entry   *target,
        const char      *gr_ndn,
        const char      *op_ndn,
-       const char      *objectclassValue,
-       const char      *groupattrName
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       ObjectClass *group_oc,
+       AttributeDescription *group_at
+#else
+       const char      *group_oc,
+       const char      *group_at
+#endif
 )
 {
        if (be->be_group)
                return( be->be_group(be, target, gr_ndn, op_ndn,
-                       objectclassValue, groupattrName) );
+                       group_oc, group_at) );
        else
-               return(1);
+               return LDAP_UNWILLING_TO_PERFORM;
 }
 
 #ifdef SLAPD_SCHEMA_DN
-Attribute *backend_subschemasubentry( Backend *be )
+Attribute *backend_operational(
+       Backend *be,
+       Entry *e )
 {
-       /* should be backend specific */
-       static struct berval ss_val = {
-               sizeof(SLAPD_SCHEMA_DN)-1,
-               SLAPD_SCHEMA_DN };
-       static struct berval *ss_vals[2] = { &ss_val, NULL };
-       static Attribute ss_attr = {
-               "subschemasubentry",
-               ss_vals,
-               SYNTAX_DN | SYNTAX_CIS,
-               NULL
-       };
-
-       return &ss_attr;
+       Attribute *a = ch_malloc( sizeof( Attribute ) );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       a->a_desc = ad_dup( slap_schema.si_ad_subschemaSubentry );
+#else
+       a->a_type = ch_strdup("subschemasubentry");
+       a->a_syntax = SYNTAX_DN | SYNTAX_CIS;
+#endif
+
+       /* Should be backend specific */
+       a->a_vals = ch_malloc( 2 * sizeof( struct berval * ) );
+       a->a_vals[0] = ber_bvstrdup( SLAPD_SCHEMA_DN );
+       a->a_vals[1] = NULL;
+
+       a->a_next = NULL;
+
+       return a;
 }
 #endif