mirror of
https://github.com/samba-team/samba.git
synced 2025-02-23 09:57:40 +03:00
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>
This commit is contained in:
Stefan Metzmacher
parent
d0f424a23d
commit
99d5a5ead4
@ -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__ */
|
||||
|
||||
@ -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);
|
||||
|
||||
68
source4/dns_server/dnsserver_common.c
Normal file
68
source4/dns_server/dnsserver_common.c
Normal file
@ -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;
|
||||
}
|
||||
28
source4/dns_server/dnsserver_common.h
Normal file
28
source4/dns_server/dnsserver_common.h
Normal file
@ -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__ */
|
||||
@ -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()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user