s4:dns_server: split out a private 'dnsserver_common' library

This will contain common code for the internal dns server, the dlz_bind9 module
and the rpc dns management server.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10749

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dns_server/dns_server.h b/source4/dns_server/dns_server.h
index efe4db822fc638e342615f9371265865ae4821f9..24596161b75cbd835baa8e71f4c8c7261066a19e 100644 (file)
--- a/source4/dns_server/dns_server.h
+++ b/source4/dns_server/dns_server.h
@@ -86,7 +86,6 @@ WERROR dns_server_process_update(struct dns_server *dns,
                                 struct dns_res_rec **updates,    uint16_t *update_count,
                                 struct dns_res_rec **additional, uint16_t *arcount);
 
-uint8_t werr_to_dns_err(WERROR werror);
 bool dns_name_match(const char *zone, const char *name, size_t *host_part_len);
 bool dns_name_equal(const char *name1, const char *name2);
 bool dns_records_match(struct dnsp_DnssrvRpcRecord *rec1,
@@ -124,5 +123,6 @@ WERROR dns_sign_tsig(struct dns_server *dns,
                     struct dns_name_packet *packet,
                     uint16_t error);
 
-#define DNS_ERR(err_str) WERR_DNS_ERROR_RCODE_##err_str
+#include "source4/dns_server/dnsserver_common.h"
+
 #endif /* __DNS_SERVER_H__ */

diff --git a/source4/dns_server/dns_utils.c b/source4/dns_server/dns_utils.c
index 14ca2f417384cfd203021df4e102f9368cbf6250..461e58d1add5cc5edf6531a922db8a16bbc898c3 100644 (file)
--- a/source4/dns_server/dns_utils.c
+++ b/source4/dns_server/dns_utils.c
@@ -33,39 +33,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_DNS
 
-uint8_t werr_to_dns_err(WERROR werr)
-{
-       if (W_ERROR_EQUAL(WERR_OK, werr)) {
-               return DNS_RCODE_OK;
-       } else if (W_ERROR_EQUAL(DNS_ERR(FORMAT_ERROR), werr)) {
-               return DNS_RCODE_FORMERR;
-       } else if (W_ERROR_EQUAL(DNS_ERR(SERVER_FAILURE), werr)) {
-               return DNS_RCODE_SERVFAIL;
-       } else if (W_ERROR_EQUAL(DNS_ERR(NAME_ERROR), werr)) {
-               return DNS_RCODE_NXDOMAIN;
-       } else if (W_ERROR_EQUAL(WERR_DNS_ERROR_NAME_DOES_NOT_EXIST, werr)) {
-               return DNS_RCODE_NXDOMAIN;
-       } else if (W_ERROR_EQUAL(DNS_ERR(NOT_IMPLEMENTED), werr)) {
-               return DNS_RCODE_NOTIMP;
-       } else if (W_ERROR_EQUAL(DNS_ERR(REFUSED), werr)) {
-               return DNS_RCODE_REFUSED;
-       } else if (W_ERROR_EQUAL(DNS_ERR(YXDOMAIN), werr)) {
-               return DNS_RCODE_YXDOMAIN;
-       } else if (W_ERROR_EQUAL(DNS_ERR(YXRRSET), werr)) {
-               return DNS_RCODE_YXRRSET;
-       } else if (W_ERROR_EQUAL(DNS_ERR(NXRRSET), werr)) {
-               return DNS_RCODE_NXRRSET;
-       } else if (W_ERROR_EQUAL(DNS_ERR(NOTAUTH), werr)) {
-               return DNS_RCODE_NOTAUTH;
-       } else if (W_ERROR_EQUAL(DNS_ERR(NOTZONE), werr)) {
-               return DNS_RCODE_NOTZONE;
-       } else if (W_ERROR_EQUAL(DNS_ERR(BADKEY), werr)) {
-               return DNS_RCODE_BADKEY;
-       }
-       DEBUG(5, ("No mapping exists for %s\n", win_errstr(werr)));
-       return DNS_RCODE_SERVFAIL;
-}
-
 bool dns_name_match(const char *zone, const char *name, size_t *host_part_len)
 {
        size_t zl = strlen(zone);

diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
new file mode 100644 (file)
index 0000000..997ce03
--- /dev/null
+++ b/source4/dns_server/dnsserver_common.c
@@ -0,0 +1,68 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   DNS server utils
+
+   Copyright (C) 2010 Kai Blin
+   Copyright (C) 2014 Stefan Metzmacher
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/util/ntstatus.h"
+#include "libcli/util/werror.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/gen_ndr/ndr_dns.h"
+#include "librpc/gen_ndr/ndr_dnsp.h"
+#include <ldb.h>
+#include "dsdb/samdb/samdb.h"
+#include "dsdb/common/util.h"
+#include "dns_server/dnsserver_common.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_DNS
+
+uint8_t werr_to_dns_err(WERROR werr)
+{
+       if (W_ERROR_EQUAL(WERR_OK, werr)) {
+               return DNS_RCODE_OK;
+       } else if (W_ERROR_EQUAL(DNS_ERR(FORMAT_ERROR), werr)) {
+               return DNS_RCODE_FORMERR;
+       } else if (W_ERROR_EQUAL(DNS_ERR(SERVER_FAILURE), werr)) {
+               return DNS_RCODE_SERVFAIL;
+       } else if (W_ERROR_EQUAL(DNS_ERR(NAME_ERROR), werr)) {
+               return DNS_RCODE_NXDOMAIN;
+       } else if (W_ERROR_EQUAL(WERR_DNS_ERROR_NAME_DOES_NOT_EXIST, werr)) {
+               return DNS_RCODE_NXDOMAIN;
+       } else if (W_ERROR_EQUAL(DNS_ERR(NOT_IMPLEMENTED), werr)) {
+               return DNS_RCODE_NOTIMP;
+       } else if (W_ERROR_EQUAL(DNS_ERR(REFUSED), werr)) {
+               return DNS_RCODE_REFUSED;
+       } else if (W_ERROR_EQUAL(DNS_ERR(YXDOMAIN), werr)) {
+               return DNS_RCODE_YXDOMAIN;
+       } else if (W_ERROR_EQUAL(DNS_ERR(YXRRSET), werr)) {
+               return DNS_RCODE_YXRRSET;
+       } else if (W_ERROR_EQUAL(DNS_ERR(NXRRSET), werr)) {
+               return DNS_RCODE_NXRRSET;
+       } else if (W_ERROR_EQUAL(DNS_ERR(NOTAUTH), werr)) {
+               return DNS_RCODE_NOTAUTH;
+       } else if (W_ERROR_EQUAL(DNS_ERR(NOTZONE), werr)) {
+               return DNS_RCODE_NOTZONE;
+       } else if (W_ERROR_EQUAL(DNS_ERR(BADKEY), werr)) {
+               return DNS_RCODE_BADKEY;
+       }
+       DEBUG(5, ("No mapping exists for %s\n", win_errstr(werr)));
+       return DNS_RCODE_SERVFAIL;
+}

diff --git a/source4/dns_server/dnsserver_common.h b/source4/dns_server/dnsserver_common.h
new file mode 100644 (file)
index 0000000..41febe2
--- /dev/null
+++ b/source4/dns_server/dnsserver_common.h
@@ -0,0 +1,28 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   DNS server utils
+
+   Copyright (C) 2014 Stefan Metzmacher
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DNSSERVER_COMMON_H__
+#define __DNSSERVER_COMMON_H__
+
+uint8_t werr_to_dns_err(WERROR werr);
+#define DNS_ERR(err_str) WERR_DNS_ERROR_RCODE_##err_str
+
+#endif /* __DNSSERVER_COMMON_H__ */

diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 280f8de49c01e5a631efb69b433e566c750f4343..66e6b7224ddb9609601f7f98a6e3ae73c40325c3 100644 (file)
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -1,10 +1,16 @@
 #!/usr/bin/env python
 
+bld.SAMBA_LIBRARY('dnsserver_common',
+        source='dnsserver_common.c',
+        deps='samba-util errors ldbsamba clidns',
+        private_library=True,
+        )
+
 bld.SAMBA_MODULE('service_dns',
         source='dns_server.c dns_query.c dns_update.c dns_utils.c dns_crypto.c',
         subsystem='service',
         init_function='server_service_dns_init',
-        deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba clidns gensec auth samba_server_gensec',
+        deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba clidns gensec auth samba_server_gensec dnsserver_common',
         local_include=False,
         internal_module=False,
         enabled=bld.AD_DC_BUILD_IS_ENABLED()