Preliminary ldapAdd support

[openldap] / servers / slapd / back-ldbm / init.c

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 993d85acbf3aa245ef96f31d1659914aa8323d5b..85802bff9d3d9424ad07fd0d4b7c64d0a723ddc9 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,21 +24,6 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-#ifdef SLAPD_LDBM_DYNAMIC
-
-int init_module(int argc, char *argv[]) {
-    BackendInfo bi;
-
-    memset( &bi, '\0', sizeof(bi) );
-    bi.bi_type = "ldbm";
-    bi.bi_init = ldbm_back_initialize;
-
-    backend_add(&bi);
-    return 0;
-}
-
-#endif /* SLAPD_LDBM_DYNAMIC */
-
 int
 ldbm_back_initialize(
     BackendInfo        *bi
@@ -46,12 +31,22 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-               LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#endif
                NULL
        };
 
        bi->bi_controls = controls;
 
+       bi->bi_flags |= 
+               SLAP_BFLAG_INCREMENT |
+#ifdef LDBM_SUBENTRIES
+               SLAP_BFLAG_SUBENTRIES |
+#endif
+               SLAP_BFLAG_ALIASES |
+               SLAP_BFLAG_REFERRALS;
+
        bi->bi_open = ldbm_back_open;
        bi->bi_config = NULL;
        bi->bi_close = ldbm_back_close;
@@ -140,15 +135,6 @@ ldbm_back_db_init(
 {
        struct ldbminfo *li;
 
-       /* indicate system schema supported */
-       be->be_flags |= 
-               SLAP_BFLAG_INCREMENT |
-#ifdef LDBM_SUBENTRIES
-               SLAP_BFLAG_SUBENTRIES |
-#endif
-               SLAP_BFLAG_ALIASES |
-               SLAP_BFLAG_REFERRALS;
-
        /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
 
@@ -220,13 +206,8 @@ ldbm_back_db_open(
 
                if ( rc != 0 )
                {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( BACK_LDBM, ERR, "ldbm_back_db_open: sync "
-                               "ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-#else  
                        Debug(  LDAP_DEBUG_ANY,
                                "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-#endif
                        return 1;
                }
        }
@@ -258,3 +239,12 @@ ldbm_back_db_destroy(
 
        return 0;
 }
+
+#if SLAPD_LDBM == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( ldbm )
+
+#endif /* SLAPD_LDBM == SLAPD_MOD_DYNAMIC */
+
+