* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: config.c,v 1.120 2011/08/30 05:16:10 marka Exp $ */
+/* $Id: config.c,v 1.121 2011/08/30 23:46:51 tbox Exp $ */
/*! \file */
return (ISC_R_NOTFOUND);
checknames = NULL;
if (cfg_map_get(maps[i], "check-names",
- &checknames) == ISC_R_SUCCESS) {
+ &checknames) == ISC_R_SUCCESS) {
/*
* Zone map entry is not a list.
*/
/*
- * Copyright (C) 2004-2007, 2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zoneconf.h,v 1.29 2011/08/30 05:16:11 marka Exp $ */
+/* $Id: zoneconf.h,v 1.30 2011/08/30 23:46:51 tbox Exp $ */
#ifndef NS_ZONECONF_H
#define NS_ZONECONF_H 1
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zoneconf.c,v 1.180 2011/08/30 12:45:43 marka Exp $ */
+/* $Id: zoneconf.c,v 1.181 2011/08/30 23:46:51 tbox Exp $ */
/*% */
dns_zone_settype(zone, dns_zone_master);
} else
dns_zone_settype(zone, ztype);
-
+
obj = NULL;
result = cfg_map_get(zoptions, "database", &obj);
dns_zone_setkeyopt(zone, DNS_ZONEKEY_ALLOW, allow);
dns_zone_setkeyopt(zone, DNS_ZONEKEY_MAINTAIN, maint);
}
- }
+ }
if (ztype == dns_zone_slave) {
RETERR(configure_zone_acl(zconfig, vconfig, config,
keynames, count);
ns_config_putipandkeylist(mctx, &addrs, &keynames,
count);
- } else
+ } else
result = dns_zone_setmasters(mayberaw, NULL, 0);
RETERR(result);
result = ns_config_get(maps, "alt-transfer-source", &obj);
INSIST(result == ISC_R_SUCCESS && obj != NULL);
RETERR(dns_zone_setaltxfrsource4(mayberaw,
- cfg_obj_assockaddr(obj)));
+ cfg_obj_assockaddr(obj)));
obj = NULL;
result = ns_config_get(maps, "alt-transfer-source-v6", &obj);
INSIST(result == ISC_R_SUCCESS && obj != NULL);
RETERR(dns_zone_setaltxfrsource6(mayberaw,
- cfg_obj_assockaddr(obj)));
+ cfg_obj_assockaddr(obj)));
obj = NULL;
(void)ns_config_get(maps, "use-alt-transfer-source", &obj);
return (ISC_FALSE);
obj = NULL;
- (void)cfg_map_get(zoptions, "signing", &obj);
+ (void)cfg_map_get(zoptions, "signing", &obj);
if (obj == NULL || !cfg_obj_asboolean(obj)) {
dns_zone_t *raw = NULL;
dns_zone_getraw(zone, &raw);
/*
- * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: adb_test.c,v 1.72 2011/08/30 21:51:34 marka Exp $ */
+/* $Id: adb_test.c,v 1.73 2011/08/30 23:46:51 tbox Exp $ */
/*! \file */
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+#
+# 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.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC 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: clean.sh,v 1.2 2011/08/30 23:46:52 tbox Exp $
+
rm -f */named.memstats
rm -f */named.run
rm -f */trusted.conf
/*
- * Copyright (C) 2011 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
* purpose with or without fee is hereby granted, provided that the above
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: named.conf,v 1.1 2011/08/30 05:16:13 marka Exp $ */
+/* $Id: named.conf,v 1.2 2011/08/30 23:46:52 tbox Exp $ */
// NS1
-; Copyright (C) 2004, 2007-2011 Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000-2002 Internet Software Consortium.
+; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
-; $Id: bits.db.in,v 1.1 2011/08/30 05:16:13 marka Exp $
+; $Id: bits.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
$TTL 300 ; 5 minutes
@ IN SOA ns2 . (
/*
- * Copyright (C) 2011 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
* purpose with or without fee is hereby granted, provided that the above
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: named.conf,v 1.1 2011/08/30 05:16:13 marka Exp $ */
+/* $Id: named.conf,v 1.2 2011/08/30 23:46:52 tbox Exp $ */
// NS2
/*
- * Copyright (C) 2011 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
* purpose with or without fee is hereby granted, provided that the above
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: named.conf,v 1.1 2011/08/30 05:16:13 marka Exp $ */
+/* $Id: named.conf,v 1.2 2011/08/30 23:46:52 tbox Exp $ */
// NS2
#!/bin/sh -e
#
-# Copyright (C) 2004, 2006-2011 Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002 Internet Software Consortium.
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: sign.sh,v 1.1 2011/08/30 05:16:13 marka Exp $
+# $Id: sign.sh,v 1.2 2011/08/30 23:46:52 tbox Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh
/*
- * Copyright (C) 2011 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
* purpose with or without fee is hereby granted, provided that the above
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: named.conf,v 1.1 2011/08/30 05:16:13 marka Exp $ */
+/* $Id: named.conf,v 1.2 2011/08/30 23:46:52 tbox Exp $ */
// NS2
-; Copyright (C) 2004, 2007-2011 Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000-2002 Internet Software Consortium.
+; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
-; $Id: noixfr.db.in,v 1.1 2011/08/30 05:16:13 marka Exp $
+; $Id: noixfr.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
$TTL 300 ; 5 minutes
@ IN SOA ns4 . (
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+#
+# 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.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC 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: setup.sh,v 1.2 2011/08/30 23:46:52 tbox Exp $
+
sh clean.sh
touch ns2/trusted.conf
#!/bin/sh
#
-# Copyright (C) 2008 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
# purpose with or without fee is hereby granted, provided that the above
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: tests.sh,v 1.1 2011/08/30 05:16:12 marka Exp $
+# $Id: tests.sh,v 1.2 2011/08/30 23:46:52 tbox Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
/*
- * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: events.h,v 1.57 2011/08/30 05:16:15 marka Exp $ */
+/* $Id: events.h,v 1.58 2011/08/30 23:46:53 tbox Exp $ */
#ifndef DNS_EVENTS_H
#define DNS_EVENTS_H 1
/*
- * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: journal.h,v 1.38 2011/08/30 05:16:15 marka Exp $ */
+/* $Id: journal.h,v 1.39 2011/08/30 23:46:53 tbox Exp $ */
#ifndef DNS_JOURNAL_H
#define DNS_JOURNAL_H 1
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: update.h,v 1.4 2011/08/30 13:02:39 marka Exp $ */
+/* $Id: update.h,v 1.5 2011/08/30 23:46:53 tbox Exp $ */
#ifndef DNS_UPDATE_H
#define DNS_UPDATE_H 1
typedef struct {
void (*func)(void *arg, dns_zone_t *zone, int level,
- const char *message);
+ const char *message);
void *arg;
} dns_update_log_t;
isc_result_t
dns_update_signatures(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db,
- dns_dbversion_t *oldver, dns_dbversion_t *newver,
- dns_diff_t *diff, isc_uint32_t sigvalidityinterval);
+ dns_dbversion_t *oldver, dns_dbversion_t *newver,
+ dns_diff_t *diff, isc_uint32_t sigvalidityinterval);
ISC_LANG_ENDDECLS
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: journal.c,v 1.115 2011/08/30 05:16:14 marka Exp $ */
+/* $Id: journal.c,v 1.116 2011/08/30 23:46:52 tbox Exp $ */
#include <config.h>
REQUIRE(DNS_JOURNAL_VALID(j));
REQUIRE(j->state == JOURNAL_STATE_TRANSACTION ||
- j->state == JOURNAL_STATE_BITWS);
+ j->state == JOURNAL_STATE_BITWS);
/*
* Just write out a updated header.
/*
- * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2003 Internet Software Consortium.
+ * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: update.c,v 1.4 2011/08/30 05:16:14 marka Exp $ */
+/* $Id: update.c,v 1.5 2011/08/30 23:46:52 tbox Exp $ */
#include <config.h>
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zone.c,v 1.626 2011/08/30 14:01:53 marka Exp $ */
+/* $Id: zone.c,v 1.627 2011/08/30 23:46:52 tbox Exp $ */
/*! \file */
static void
update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) {
UNUSED(arg);
- dns_zone_log(zone, level, "%s", message);
+ dns_zone_log(zone, level, "%s", message);
}
static void
isc_uint32_t oldserial, newserial;
dns_diffop_t op = DNS_DIFFOP_ADD;
dns_diff_t diff;
- dns_difftuple_t *tuple = NULL, *soatuple = NULL;
+ dns_difftuple_t *tuple = NULL, *soatuple = NULL;
dns_update_log_t log = { update_log_cb, NULL };
isc_time_t timenow;
end = ((struct secure_serial *)event)->serial;
dns_diff_init(zone->mctx, &diff);
-
+
UNUSED(task);
CHECK(dns_journal_open(zone->raw->mctx, zone->raw->journal,
DNS_JOURNAL_WRITE, &rjournal));
op = (n_soa == 1) ? DNS_DIFFOP_DEL : DNS_DIFFOP_ADD;
- CHECK(dns_difftuple_create(diff.mctx, op, name, ttl, rdata,
- &tuple));
- dns_diff_appendminimal(&diff, &tuple);
+ CHECK(dns_difftuple_create(diff.mctx, op, name, ttl, rdata,
+ &tuple));
+ dns_diff_appendminimal(&diff, &tuple);
}
if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS;
dns_rdataset_t rdataset;
dns_dbversion_t *version = NULL;
isc_time_t loadtime;
-
+
UNUSED(task);
zone = event->ev_arg;
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
dns_rdataset_init(&rdataset);
-
+
TIME_NOW(&loadtime);
result = dns_db_create(zone->mctx, zone->db_argv[0],
&rdataset, 0, NULL);
if (result != ISC_R_SUCCESS)
goto failure;
-
+
dns_rdataset_disassociate(&rdataset);
}
dns_rdatasetiter_destroy(&rdsit);
dns_db_closeversion(db, &version, ISC_TRUE);
LOCK_ZONE(zone);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY);
- result = zone_postload(zone, db, loadtime, ISC_R_SUCCESS);
+ result = zone_postload(zone, db, loadtime, ISC_R_SUCCESS);
zone_needdump(zone, 0); /* XXXMPA */
- UNLOCK_ZONE(zone);
+ UNLOCK_ZONE(zone);
failure:
if (result != ISC_R_SUCCESS)
dns_zone_log(zone, ISC_LOG_ERROR, "receive_secure_db: %s",
dns_result_totext(result));
-
+
if (dns_rdataset_isassociated(&rdataset))
dns_rdataset_disassociate(&rdataset);
if (db != NULL) {
dns_zone_getraw(dns_zone_t *zone, dns_zone_t **raw) {
REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(raw != NULL && *raw == NULL);
-
+
LOCK(&zone->lock);
if (zone->raw != NULL)
dns_zone_attach(zone->raw, raw);
/*
- * Portions Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: getnameinfo.c,v 1.40 2011/08/30 00:18:43 marka Exp $ */
+/* $Id: getnameinfo.c,v 1.41 2011/08/30 23:46:53 tbox Exp $ */
/*! \file */
* sockaddr sa which is salen bytes long. The hostname is of length
* hostlen and is returned via *host. The maximum length of the hostname
* is 1025 bytes: #NI_MAXHOST.
- *
+ *
* The name of the service associated with the port number in sa is
* returned in *serv. It is servlen bytes long. The maximum length of the
* service name is #NI_MAXSERV - 32 bytes.
- *
+ *
* The flags argument sets the following bits:
- *
+ *
* \li #NI_NOFQDN:
* A fully qualified domain name is not required for local hosts.
* The local part of the fully qualified domain name is returned
* instead.
- *
+ *
* \li #NI_NUMERICHOST
* Return the address in numeric form, as if calling inet_ntop(),
* instead of a host name.
- *
+ *
* \li #NI_NAMEREQD
* A name is required. If the hostname cannot be found in the DNS
* and this flag is set, a non-zero error code is returned. If the
* hostname is not found and the flag is not set, the address is
* returned in numeric form.
- *
+ *
* \li #NI_NUMERICSERV
* The service name is returned as a digit string representing the
* port number.
- *
+ *
* \li #NI_DGRAM
* Specifies that the service being looked up is a datagram
* service, and causes getservbyport() to be called with a second
* argument of "udp" instead of its default of "tcp". This is
* required for the few ports (512-514) that have different
* services for UDP and TCP.
- *
+ *
* \section getnameinfo_return Return Values
- *
+ *
* lwres_getnameinfo() returns 0 on success or a non-zero error code if
* an error occurs.
- *
+ *
* \section getname_see See Also
- *
- * RFC2133, getservbyport(),
+ *
+ * RFC2133, getservbyport(),
* lwres_getnamebyaddr(). lwres_net_ntop().
- *
+ *
* \section getnameinfo_bugs Bugs
- *
+ *
* RFC2133 fails to define what the nonzero return values of
* getnameinfo() are.
*/
projects / thirdparty / bind9.git / commitdiff
