Install *.schema only

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 8dd65ff26e0eb280de80bad425be929d08e65194..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 );
        }
 
@@ -592,7 +608,8 @@ int
 backend_check_controls(
        Backend *be,
        Connection *conn,
-       Operation *op )
+       Operation *op,
+       const char **text )
 {
        LDAPControl **ctrls;
        ctrls = op->o_ctrls;
@@ -604,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;
                }
        }
@@ -617,19 +635,20 @@ backend_group(
        Entry   *target,
        const char      *gr_ndn,
        const char      *op_ndn,
-       const char      *objectclassValue,
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       AttributeType *group_at
+       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, group_at) );
+                       group_oc, group_at) );
        else
-               return(1);
+               return LDAP_UNWILLING_TO_PERFORM;
 }
 
 #ifdef SLAPD_SCHEMA_DN
@@ -639,17 +658,15 @@ Attribute *backend_operational(
 {
        Attribute *a = ch_malloc( sizeof( Attribute ) );
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not yet implemented */
+       a->a_desc = ad_dup( slap_schema.si_ad_subschemaSubentry );
 #else
-       a->a_type = "subschemasubentry";
+       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] = ch_malloc( sizeof( struct berval ) );
-       a->a_vals[0]->bv_val = strdup( SLAPD_SCHEMA_DN );
-       a->a_vals[0]->bv_len = sizeof( SLAPD_SCHEMA_DN ) - 1;
+       a->a_vals[0] = ber_bvstrdup( SLAPD_SCHEMA_DN );
        a->a_vals[1] = NULL;
 
        a->a_next = NULL;