Sync with HEAD

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

diff --git a/servers/slapd/back-dnssrv/init.c b/servers/slapd/back-dnssrv/init.c
index c6a994bd0c9a443fe9479470d0df551942696747..980d231200509f2cb137e937d8bf3fe5f2622dfb 100644 (file)
--- a/servers/slapd/back-dnssrv/init.c
+++ b/servers/slapd/back-dnssrv/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * Portions Copyright 2000-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -26,23 +26,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "external.h"
-
-#ifdef SLAPD_DNSSRV_DYNAMIC
-
-int init_module(int argc, char *argv[])
-{
-    BackendInfo bi;
-
-    memset( &bi, '\0', sizeof(bi) );
-    bi.bi_type = "dnssrv";
-    bi.bi_init = dnssrv_back_initialize;
-
-    backend_add( &bi );
-    return 0;
-}
-
-#endif /* SLAPD_DNSSRV_DYNAMIC */
+#include "proto-dnssrv.h"
 
 int
 dnssrv_back_initialize(
@@ -50,13 +34,12 @@ dnssrv_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-               LDAP_CONTROL_VALUESRETURNFILTER,
                NULL
        };
 
        bi->bi_controls = controls;
 
-       bi->bi_open = 0;
+       bi->bi_open = dnssrv_back_open;
        bi->bi_config = 0;
        bi->bi_close = 0;
        bi->bi_destroy = 0;
@@ -87,6 +70,21 @@ dnssrv_back_initialize(
        return 0;
 }
 
+AttributeDescription   *ad_dc;
+AttributeDescription   *ad_associatedDomain;
+
+int
+dnssrv_back_open(
+    BackendInfo *bi )
+{
+       const char *text;
+
+       (void)slap_str2ad( "dc", &ad_dc, &text );
+       (void)slap_str2ad( "associatedDomain", &ad_associatedDomain, &text );
+
+       return 0;
+}
+
 int
 dnssrv_back_db_init(
     Backend    *be )
@@ -100,3 +98,11 @@ dnssrv_back_db_destroy(
 {
        return 0;
 }
+
+#if SLAPD_DNSSRV == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( dnssrv )
+
+#endif /* SLAPD_DNSSRV == SLAPD_MOD_DYNAMIC */
+