mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

update copyright notice

Browse Source
This commit is contained in:
Automatic Updater
2011-03-10 23:47:50 +00:00
parent 8711e5c73c
commit cf786a52ce
11 changed files with 98 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/named/Makefile.in
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2002 Internet Software Consortium. # Copyright (C) 1998-2002 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.115 2011/03/10 04:36:14 each Exp $ # $Id: Makefile.in,v 1.116 2011/03/10 23:47:49 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

50
bin/named/include/dlz/dlz_dlopen_driver.h
View File

@@ -1,45 +1,21 @@
/* /*
* Copyright (C) 2010-2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Written by Andrew Tridgell * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* *
* based on dlz_stub_driver.h * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* which is: * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* Copyright (C) 2002 Stichting NLnet, Netherlands, stichting@nlnet.nl. * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* Copyright (C) 1999-2001 Internet Software Consortium. * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* Permission to use, copy, modify, and distribute this software for any * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* purpose with or without fee is hereby granted, provided that the * PERFORMANCE OF THIS SOFTWARE.
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* STICHTING NLNET BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* The development of Dynamically Loadable Zones (DLZ) for Bind 9 was
* conceived and contributed by Rob Butler.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ROB BUTLER
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* ROB BUTLER BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dlz_dlopen_driver.h,v 1.3 2011/03/10 23:47:49 tbox Exp $ */
#ifndef DLZ_DLOPEN_DRIVER_H #ifndef DLZ_DLOPEN_DRIVER_H
#define DLZ_DLOPEN_DRIVER_H #define DLZ_DLOPEN_DRIVER_H

4
bin/named/main.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: main.c,v 1.181 2011/03/10 04:36:14 each Exp $ */ /* $Id: main.c,v 1.182 2011/03/10 23:47:49 tbox Exp $ */
/*! \file */ /*! \file */

4
bin/named/unix/Makefile.in
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-2001 Internet Software Consortium. # Copyright (C) 1999-2001 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.14 2011/03/10 04:36:14 each Exp $ # $Id: Makefile.in,v 1.15 2011/03/10 23:47:49 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

57
bin/named/unix/dlz_dlopen_driver.c
View File

@@ -1,46 +1,21 @@
/* /*
* Copyright (C) 2010,2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Written by Andrew Tridgell * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* *
* based on dlz_stub_driver.c * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* which is: * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* Copyright (C) 2002 Stichting NLnet, Netherlands, stichting@nlnet.nl. * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* Copyright (C) 1999-2001 Internet Software Consortium. * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* see dlz_stub_driver.c for details * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* Permission to use, copy, modify, and distribute this software for any * PERFORMANCE OF THIS SOFTWARE.
* purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* STICHTING NLNET BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* The development of Dynamically Loadable Zones (DLZ) for Bind 9 was
* conceived and contributed by Rob Butler.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ROB BUTLER
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* ROB BUTLER BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dlz_dlopen_driver.c,v 1.3 2011/03/10 23:47:49 tbox Exp $ */
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
@@ -162,7 +137,7 @@ dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata,
static isc_result_t static isc_result_t
dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name,
const char *client) const char *client)
{ {
dlopen_data_t *cd = (dlopen_data_t *) dbdata; dlopen_data_t *cd = (dlopen_data_t *) dbdata;
isc_result_t result; isc_result_t result;
@@ -237,7 +212,7 @@ dl_load_symbol(dlopen_data_t *cd, const char *symbol, isc_boolean_t mandatory) {
void *ptr = dlsym(cd->dl_handle, symbol); void *ptr = dlsym(cd->dl_handle, symbol);
if (ptr == NULL && mandatory) { if (ptr == NULL && mandatory) {
dlopen_log(ISC_LOG_ERROR, dlopen_log(ISC_LOG_ERROR,
"dlz_dlopen: library '%s' is missing " "dlz_dlopen: library '%s' is missing "
"required symbol '%s'", cd->dl_path, symbol); "required symbol '%s'", cd->dl_path, symbol);
} }
return (ptr); return (ptr);
@@ -333,7 +308,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
cd->dlz_authority = dl_load_symbol(cd, "dlz_authority", ISC_FALSE); cd->dlz_authority = dl_load_symbol(cd, "dlz_authority", ISC_FALSE);
cd->dlz_newversion = dl_load_symbol(cd, "dlz_newversion", ISC_FALSE); cd->dlz_newversion = dl_load_symbol(cd, "dlz_newversion", ISC_FALSE);
cd->dlz_closeversion = dl_load_symbol(cd, "dlz_closeversion", cd->dlz_closeversion = dl_load_symbol(cd, "dlz_closeversion",
ISC_TF(cd->dlz_newversion != NULL)); ISC_TF(cd->dlz_newversion != NULL));
cd->dlz_configure = dl_load_symbol(cd, "dlz_configure", ISC_FALSE); cd->dlz_configure = dl_load_symbol(cd, "dlz_configure", ISC_FALSE);
cd->dlz_ssumatch = dl_load_symbol(cd, "dlz_ssumatch", ISC_FALSE); cd->dlz_ssumatch = dl_load_symbol(cd, "dlz_ssumatch", ISC_FALSE);
cd->dlz_addrdataset = dl_load_symbol(cd, "dlz_addrdataset", ISC_FALSE); cd->dlz_addrdataset = dl_load_symbol(cd, "dlz_addrdataset", ISC_FALSE);

57
bin/named/win32/dlz_dlopen_driver.c
View File

@@ -1,46 +1,21 @@
/* /*
* Copyright (C) 2010,2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Written by Andrew Tridgell * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* *
* based on dlz_stub_driver.c * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* which is: * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* Copyright (C) 2002 Stichting NLnet, Netherlands, stichting@nlnet.nl. * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* Copyright (C) 1999-2001 Internet Software Consortium. * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* see dlz_stub_driver.c for details * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* Permission to use, copy, modify, and distribute this software for any * PERFORMANCE OF THIS SOFTWARE.
* purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* STICHTING NLNET BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* The development of Dynamically Loadable Zones (DLZ) for Bind 9 was
* conceived and contributed by Rob Butler.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ROB BUTLER
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* ROB BUTLER BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dlz_dlopen_driver.c,v 1.3 2011/03/10 23:47:49 tbox Exp $ */
#include <config.h> #include <config.h>
#include <windows.h> #include <windows.h>
@@ -163,7 +138,7 @@ dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata,
static isc_result_t static isc_result_t
dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name,
const char *client) const char *client)
{ {
dlopen_data_t *cd = (dlopen_data_t *) dbdata; dlopen_data_t *cd = (dlopen_data_t *) dbdata;
isc_result_t result; isc_result_t result;
@@ -238,7 +213,7 @@ dl_load_symbol(dlopen_data_t *cd, const char *symbol, isc_boolean_t mandatory) {
void *ptr = GetProcAddress(cd->dl_handle, symbol); void *ptr = GetProcAddress(cd->dl_handle, symbol);
if (ptr == NULL && mandatory) { if (ptr == NULL && mandatory) {
dlopen_log(ISC_LOG_ERROR, dlopen_log(ISC_LOG_ERROR,
"dlz_dlopen: library '%s' is missing " "dlz_dlopen: library '%s' is missing "
"required symbol '%s'", cd->dl_path, symbol); "required symbol '%s'", cd->dl_path, symbol);
} }
return (ptr); return (ptr);
@@ -323,7 +298,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
cd->dlz_authority = dl_load_symbol(cd, "dlz_authority", ISC_FALSE); cd->dlz_authority = dl_load_symbol(cd, "dlz_authority", ISC_FALSE);
cd->dlz_newversion = dl_load_symbol(cd, "dlz_newversion", ISC_FALSE); cd->dlz_newversion = dl_load_symbol(cd, "dlz_newversion", ISC_FALSE);
cd->dlz_closeversion = dl_load_symbol(cd, "dlz_closeversion", cd->dlz_closeversion = dl_load_symbol(cd, "dlz_closeversion",
ISC_TF(cd->dlz_newversion != NULL)); ISC_TF(cd->dlz_newversion != NULL));
cd->dlz_configure = dl_load_symbol(cd, "dlz_configure", ISC_FALSE); cd->dlz_configure = dl_load_symbol(cd, "dlz_configure", ISC_FALSE);
cd->dlz_ssumatch = dl_load_symbol(cd, "dlz_ssumatch", ISC_FALSE); cd->dlz_ssumatch = dl_load_symbol(cd, "dlz_ssumatch", ISC_FALSE);
cd->dlz_addrdataset = dl_load_symbol(cd, "dlz_addrdataset", ISC_FALSE); cd->dlz_addrdataset = dl_load_symbol(cd, "dlz_addrdataset", ISC_FALSE);

4
bin/named/xfrout.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: xfrout.c,v 1.140 2011/03/10 04:36:14 each Exp $ */ /* $Id: xfrout.c,v 1.141 2011/03/10 23:47:49 tbox Exp $ */
#include <config.h> #include <config.h>

56
bin/tests/system/dlzexternal/driver.c
View File

@@ -1,21 +1,21 @@
/* /*
* Copyright (C) 2010 Andrew Tridgell * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the * purpose with or without fee is hereby granted, provided that the above
* above copyright notice and this permission notice appear in all * copyright notice and this permission notice appear in all copies.
* copies.
* *
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* STICHTING NLNET BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE * PERFORMANCE OF THIS SOFTWARE.
* USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: driver.c,v 1.3 2011/03/10 23:47:49 tbox Exp $ */
/* /*
* This provides a very simple example of an external loadable DLZ * This provides a very simple example of an external loadable DLZ
* driver, with update support. * driver, with update support.
@@ -99,7 +99,7 @@ add_name(struct dlz_example_data *state, struct record *list,
if (first_empty == -1 && strlen(list[i].name) == 0) { if (first_empty == -1 && strlen(list[i].name) == 0) {
first_empty = i; first_empty = i;
} }
if (strcasecmp(list[i].name, name) != 0) if (strcasecmp(list[i].name, name) != 0)
continue; continue;
if (strcasecmp(list[i].type, type) != 0) if (strcasecmp(list[i].type, type) != 0)
continue; continue;
@@ -271,7 +271,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
int i; int i;
UNUSED(zone); UNUSED(zone);
if (strcmp(name, "@") == 0) if (strcmp(name, "@") == 0)
strcpy(full_name, state->zone_name); strcpy(full_name, state->zone_name);
else else
@@ -281,7 +281,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
if (strcasecmp(state->current[i].name, full_name) == 0) { if (strcasecmp(state->current[i].name, full_name) == 0) {
isc_result_t result; isc_result_t result;
found = ISC_TRUE; found = ISC_TRUE;
result = state->putrr(lookup, state->current[i].type, result = state->putrr(lookup, state->current[i].type,
state->current[i].ttl, state->current[i].ttl,
state->current[i].data); state->current[i].data);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -382,19 +382,19 @@ dlz_closeversion(const char *zone, isc_boolean_t commit,
zone); zone);
for (i = 0; i < MAX_RECORDS; i++) { for (i = 0; i < MAX_RECORDS; i++) {
if (strlen(state->adds[i].name) > 0) { if (strlen(state->adds[i].name) > 0) {
add_name(state, &state->current[0], add_name(state, &state->current[0],
state->adds[i].name, state->adds[i].name,
state->adds[i].type, state->adds[i].type,
state->adds[i].ttl, state->adds[i].ttl,
state->adds[i].data); state->adds[i].data);
} }
} }
for (i = 0; i < MAX_RECORDS; i++) { for (i = 0; i < MAX_RECORDS; i++) {
if (strlen(state->deletes[i].name) > 0) { if (strlen(state->deletes[i].name) > 0) {
del_name(state, &state->current[0], del_name(state, &state->current[0],
state->deletes[i].name, state->deletes[i].name,
state->deletes[i].type, state->deletes[i].type,
state->deletes[i].ttl, state->deletes[i].ttl,
state->deletes[i].data); state->deletes[i].data);
} }
} }
@@ -456,12 +456,12 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr,
if (strncmp(name, "deny.", 5) == 0) { if (strncmp(name, "deny.", 5) == 0) {
state->log(ISC_LOG_INFO, state->log(ISC_LOG_INFO,
"dlz_example: denying update of name=%s by %s", "dlz_example: denying update of name=%s by %s",
name, signer); name, signer);
return (ISC_FALSE); return (ISC_FALSE);
} }
state->log(ISC_LOG_INFO, state->log(ISC_LOG_INFO,
"dlz_example: allowing update of name=%s by %s", "dlz_example: allowing update of name=%s by %s",
name, signer); name, signer);
return (ISC_TRUE); return (ISC_TRUE);
} }
@@ -539,7 +539,7 @@ dlz_subrdataset(const char *name, const char *rdatastr,
state->log(ISC_LOG_INFO, state->log(ISC_LOG_INFO,
"dlz_example: subtracting rdataset %s '%s'", "dlz_example: subtracting rdataset %s '%s'",
name, rdatastr); name, rdatastr);
return (modrdataset(state, name, rdatastr, &state->deletes[0])); return (modrdataset(state, name, rdatastr, &state->deletes[0]));
} }
@@ -556,6 +556,6 @@ dlz_delrdataset(const char *name, const char *type,
state->log(ISC_LOG_INFO, state->log(ISC_LOG_INFO,
"dlz_example: deleting rdataset %s of type %s", "dlz_example: deleting rdataset %s of type %s",
name, type); name, type);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }

28
bin/tests/system/dlzexternal/driver.h
View File

@@ -1,23 +1,21 @@
/* /*
* Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Written by Andrew Tridgell. * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* *
* Permission to use, copy, modify, and distribute this software for any * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* purpose with or without fee is hereby granted, provided that the * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* above copyright notice and this permission notice appear in all * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* copies. * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL * PERFORMANCE OF THIS SOFTWARE.
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
* USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: driver.h,v 1.3 2011/03/10 23:47:50 tbox Exp $ */
/* /*
* This header provides a minimal set of defines and typedefs needed * This header provides a minimal set of defines and typedefs needed
* for building an external DLZ module for bind9. When creating a new * for building an external DLZ module for bind9. When creating a new
@@ -104,7 +102,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes);
isc_result_t isc_result_t
dlz_newversion(const char *zone, void *dbdata, void **versionp); dlz_newversion(const char *zone, void *dbdata, void **versionp);
/* /*
* dlz_closeversion() is optional, but must be supplied if you supply * dlz_closeversion() is optional, but must be supplied if you supply
* a dlz_newversion() function * a dlz_newversion() function
*/ */

4
bin/tests/system/dlzexternal/ns1/named.conf.in
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named.conf.in,v 1.2 2011/03/10 04:36:15 each Exp $ */ /* $Id: named.conf.in,v 1.3 2011/03/10 23:47:50 tbox Exp $ */
controls { }; controls { };

4
bin/tests/system/dlzexternal/prereq.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: prereq.sh,v 1.5 2011/03/10 04:36:15 each Exp $ # $Id: prereq.sh,v 1.6 2011/03/10 23:47:50 tbox Exp $
TOP=${SYSTEMTESTTOP:=.}/../../../.. TOP=${SYSTEMTESTTOP:=.}/../../../..