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 d1e0091d86108c267980d53a151224bcb38eeade..fc4063492cee1ad7fc02686aa54c7d8897c2d68b 100644 (file)
--- a/servers/slapd/back-dnssrv/init.c
+++ b/servers/slapd/back-dnssrv/init.c
@@ -1,8 +1,22 @@
 /* init.c - initialize ldap backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Portions Copyright 2000-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -12,23 +26,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "external.h"
-
-#ifdef SLAPD_DNSSRV_DYNAMIC
-
-int back_dnssrv_LTX_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(
@@ -41,7 +39,7 @@ dnssrv_back_initialize(
 
        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;
@@ -65,18 +63,29 @@ dnssrv_back_initialize(
        bi->bi_op_unbind = 0;
 
        bi->bi_extended = 0;
-       bi->bi_acl_group = 0;
-       bi->bi_acl_attribute = 0;
-
-#ifdef HAVE_CYRUS_SASL
-       bi->bi_sasl_authorize = 0;
-       bi->bi_sasl_getsecret = 0;
-       bi->bi_sasl_putsecret = 0;
-#endif /* HAVE_CYRUS_SASL */
 
        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;
 }
 
@@ -93,3 +102,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 */
+