From 1d16cf8bb8596c3e4dc1123a5bdf360bf24a272b Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Tue, 22 Jul 2008 23:47:04 +0000 Subject: [PATCH] update copyright notice --- bin/named/interfacemgr.c | 42 ++++++++++++++++++++-------------------- bin/named/lwresd.c | 8 ++++---- bin/rndc/rndc.c | 24 +++++++++++------------ bin/tests/sig0_test.c | 4 ++-- bin/tests/sock_test.c | 4 ++-- lib/dns/xfrin.c | 12 ++++++------ 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index 3bc685e63f..2ebc2794fb 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.91 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: interfacemgr.c,v 1.92 2008/07/22 23:47:04 tbox Exp $ */ /*! \file */ @@ -90,7 +90,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, mgr->generation = 1; mgr->listenon4 = NULL; mgr->listenon6 = NULL; - + ISC_LIST_INIT(mgr->interfaces); ISC_LIST_INIT(mgr->listenon); @@ -323,7 +323,7 @@ ns_interface_accepttcp(ns_interface_t *ifp) { goto tcp_listen_failure; } - /* + /* * If/when there a multiple filters listen to the * result. */ @@ -494,26 +494,26 @@ clearacl(isc_mem_t *mctx, dns_acl_t **aclp) { static isc_boolean_t listenon_is_ip6_any(ns_listenelt_t *elt) { - REQUIRE(elt && elt->acl); - return dns_acl_isany(elt->acl); + REQUIRE(elt && elt->acl); + return dns_acl_isany(elt->acl); } static isc_result_t setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) { isc_result_t result; unsigned int prefixlen; - isc_netaddr_t *netaddr; + isc_netaddr_t *netaddr; - netaddr = &interface->address; - - /* First add localhost address */ + netaddr = &interface->address; + + /* First add localhost address */ prefixlen = (netaddr->family == AF_INET) ? 32 : 128; - result = dns_iptable_addprefix(mgr->aclenv.localhost->iptable, - netaddr, prefixlen, ISC_TRUE); + result = dns_iptable_addprefix(mgr->aclenv.localhost->iptable, + netaddr, prefixlen, ISC_TRUE); if (result != ISC_R_SUCCESS) return (result); - /* Then add localnets prefix */ + /* Then add localnets prefix */ result = isc_netaddr_masktoprefixlen(&interface->netmask, &prefixlen); @@ -528,11 +528,11 @@ setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) { "localnets ACL: %s", interface->name, isc_result_totext(result)); - return (ISC_R_SUCCESS); + return (ISC_R_SUCCESS); } - result = dns_iptable_addprefix(mgr->aclenv.localnets->iptable, - netaddr, prefixlen, ISC_TRUE); + result = dns_iptable_addprefix(mgr->aclenv.localnets->iptable, + netaddr, prefixlen, ISC_TRUE); if (result != ISC_R_SUCCESS) return (result); @@ -542,7 +542,7 @@ setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) { static void setup_listenon(ns_interfacemgr_t *mgr, isc_interface_t *interface, in_port_t port) -{ +{ isc_sockaddr_t *addr; isc_sockaddr_t *old; @@ -556,7 +556,7 @@ setup_listenon(ns_interfacemgr_t *mgr, isc_interface_t *interface, old != NULL; old = ISC_LIST_NEXT(old, link)) if (isc_sockaddr_equal(addr, old)) - break; + break; if (old != NULL) isc_mem_put(mgr->mctx, addr, sizeof(*addr)); @@ -692,7 +692,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, { isc_interface_t interface; ns_listenlist_t *ll; - unsigned int family; + unsigned int family; result = isc_interfaceiter_current(iter, &interface); if (result != ISC_R_SUCCESS) @@ -876,7 +876,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, UNEXPECTED_ERROR(__FILE__, __LINE__, "interface iteration failed: %s", isc_result_totext(result)); - else + else result = ISC_R_SUCCESS; cleanup_iter: isc_interfaceiter_destroy(&iter); @@ -907,7 +907,7 @@ ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, /* * Warn if we are not listening on any interface, unless - * we're in lwresd-only mode, in which case that is to + * we're in lwresd-only mode, in which case that is to * be expected. */ if (ext_listen == NULL && diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c index 73e3c66e36..cd6f2c77b3 100644 --- a/bin/named/lwresd.c +++ b/bin/named/lwresd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,9 +15,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.56 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: lwresd.c,v 1.57 2008/07/22 23:47:04 tbox Exp $ */ -/*! \file +/*! \file * \brief * Main program for the Lightweight Resolver Daemon. * @@ -224,7 +224,7 @@ ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx, for (i = 0; i < lwc->searchnxt; i++) { CHECK(buffer_putstr(&b, "\t\t\"")); CHECK(buffer_putstr(&b, lwc->search[i])); - CHECK(buffer_putstr(&b, "\";\n")); + CHECK(buffer_putstr(&b, "\";\n")); } CHECK(buffer_putstr(&b, "\t};\n")); } diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 8fb88924ed..0977b1a5b0 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.c,v 1.119 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: rndc.c,v 1.120 2008/07/22 23:47:04 tbox Exp $ */ /*! \file */ @@ -93,7 +93,7 @@ static void usage(int status) { fprintf(stderr, "\ Usage: %s [-c config] [-s server] [-p port]\n\ - [-k key-file ] [-y key] [-V] command\n\ + [-k key-file ] [-y key] [-V] command\n\ \n\ command is one of the following:\n\ \n\ @@ -106,10 +106,10 @@ command is one of the following:\n\ Retransfer a single zone without checking serial number.\n\ freeze Suspend updates to all dynamic zones.\n\ freeze zone [class [view]]\n\ - Suspend updates to a dynamic zone.\n\ + Suspend updates to a dynamic zone.\n\ thaw Enable updates to all dynamic zones and reload them.\n\ thaw zone [class [view]]\n\ - Enable updates to a frozen dynamic zone and reload it.\n\ + Enable updates to a frozen dynamic zone and reload it.\n\ notify zone [class [view]]\n\ Resend NOTIFY messages for the zone.\n\ reconfig Reload configuration file and new zones only.\n\ @@ -152,7 +152,7 @@ get_addresses(const char *host, in_port_t port) { result = isc_sockaddr_frompath(&serveraddrs[nserveraddrs], host); if (result == ISC_R_SUCCESS) - nserveraddrs++; + nserveraddrs++; } else { count = SERVERADDRS - nserveraddrs; result = bind9_getaddresses(host, port, @@ -485,7 +485,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, (void)cfg_map_get(config, "server", &servers); if (servers != NULL) { for (elt = cfg_list_first(servers); - elt != NULL; + elt != NULL; elt = cfg_list_next(elt)) { const char *name; @@ -521,7 +521,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, else { DO("get config key list", cfg_map_get(config, "key", &keys)); for (elt = cfg_list_first(keys); - elt != NULL; + elt != NULL; elt = cfg_list_next(elt)) { key = cfg_listelt_value(elt); @@ -599,7 +599,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, get_addresses(name, (in_port_t) myport); else fprintf(stderr, "too many address: " - "%s: dropped\n", name); + "%s: dropped\n", name); continue; } sa = *cfg_obj_assockaddr(address); @@ -741,7 +741,7 @@ main(int argc, char **argv) { case 'y': keyname = isc_commandline_argument; break; - + case '?': if (isc_commandline_option != '?') { fprintf(stderr, "%s: invalid argument -%c\n", @@ -754,7 +754,7 @@ main(int argc, char **argv) { default: fprintf(stderr, "%s: unhandled option -%c\n", program, isc_commandline_option); - exit(1); + exit(1); } } @@ -780,7 +780,7 @@ main(int argc, char **argv) { logdest.file.maximum_size = 0; DO("creating log channel", isc_log_createchannel(logconfig, "stderr", - ISC_LOG_TOFILEDESC, ISC_LOG_INFO, &logdest, + ISC_LOG_TOFILEDESC, ISC_LOG_INFO, &logdest, ISC_LOG_PRINTTAG|ISC_LOG_PRINTLEVEL)); DO("enabling log channel", isc_log_usechannel(logconfig, "stderr", NULL, NULL)); diff --git a/bin/tests/sig0_test.c b/bin/tests/sig0_test.c index 3ca2e6808a..f36bbee02f 100644 --- a/bin/tests/sig0_test.c +++ b/bin/tests/sig0_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sig0_test.c,v 1.16 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: sig0_test.c,v 1.17 2008/07/22 23:47:04 tbox Exp $ */ #include diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c index 1f5dc45f4b..51c968e356 100644 --- a/bin/tests/sock_test.c +++ b/bin/tests/sock_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sock_test.c,v 1.53 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: sock_test.c,v 1.54 2008/07/22 23:47:04 tbox Exp $ */ #include diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index b4e887ccb5..b25cdb026b 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrin.c,v 1.158 2008/07/22 03:43:04 marka Exp $ */ +/* $Id: xfrin.c,v 1.159 2008/07/22 23:47:04 tbox Exp $ */ /*! \file */ @@ -253,7 +253,7 @@ static isc_result_t axfr_init(dns_xfrin_ctx_t *xfr) { isc_result_t result; - xfr->is_ixfr = ISC_FALSE; + xfr->is_ixfr = ISC_FALSE; if (xfr->db != NULL) dns_db_detach(&xfr->db); @@ -902,8 +902,8 @@ render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf) { CHECK(dns_message_renderend(msg)); result = ISC_R_SUCCESS; failure: - if (cleanup_cctx) - dns_compress_invalidate(&cctx); + if (cleanup_cctx) + dns_compress_invalidate(&cctx); return (result); } @@ -1409,7 +1409,7 @@ maybe_free(dns_xfrin_ctx_t *xfr) { if (msecs == 0) msecs = 1; persec = (xfr->nbytes * 1000) / msecs; - xfrin_log(xfr, ISC_LOG_INFO, + xfrin_log(xfr, ISC_LOG_INFO, "Transfer completed: %d messages, %d records, " "%" ISC_PRINT_QUADFORMAT "u bytes, " "%u.%03u secs (%u bytes/sec)",