backport ITS#4320 fix from 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 2d36c332ced3a3acd034580b56ad8f867335401d..fc4063492cee1ad7fc02686aa54c7d8897c2d68b 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-2006 The OpenLDAP Foundation.
  * Portions Copyright 2000-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -27,7 +27,6 @@
 
 #include "slap.h"
 #include "proto-dnssrv.h"
-#include "external.h"
 
 int
 dnssrv_back_initialize(
@@ -35,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;
@@ -69,6 +67,25 @@ dnssrv_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
+#ifdef SLAP_OVERLAY_ACCESS
+       bi->bi_access_allowed = slap_access_always_allowed;
+#endif /* SLAP_OVERLAY_ACCESS */
+
+       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;
 }
 
@@ -88,19 +105,8 @@ dnssrv_back_db_destroy(
 
 #if SLAPD_DNSSRV == SLAPD_MOD_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;
-}
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( dnssrv )
 
-#endif /* SLAPD_DNSSRV */
+#endif /* SLAPD_DNSSRV == SLAPD_MOD_DYNAMIC */