From: Tinderbox User Date: Wed, 11 Apr 2012 23:45:52 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.10.0a1~1224 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3fb95bfcb2e478d721d378f0be5ff0a32269bc2a;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/named/builtin.c b/bin/named/builtin.c index 7f61be09eb1..ceafe5d6166 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -116,7 +116,7 @@ dns64_rdata(unsigned char *v, size_t start, unsigned char *rdata) { rdata[j++] = 1; rdata[j++] = decimal[c]; } - } + } memcpy(&rdata[j], "\07in-addr\04arpa", 14); return (j + 14); } diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh index c776ea40d14..1111c2f70a1 100644 --- a/bin/tests/system/dns64/tests.sh +++ b/bin/tests/system/dns64/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010-2012 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 diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h index 75dfd7e13ab..27519034f17 100644 --- a/lib/dns/include/dns/sdb.h +++ b/lib/dns/include/dns/sdb.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -65,9 +65,9 @@ typedef isc_result_t typedef isc_result_t (*dns_sdblookup2func_t)(const dns_name_t *zone, const dns_name_t *name, void *dbdata, dns_sdblookup_t *lookup, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); - + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo); + typedef isc_result_t (*dns_sdbauthorityfunc_t)(const char *zone, void *dbdata, dns_sdblookup_t *); diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index 25f76364d54..3dd1c46e51b 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -789,7 +789,7 @@ findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, result = imp->methods->lookup2(&sdb->common.origin, name, sdb->dbdata, node, methods, clientinfo); - else + else result = imp->methods->lookup(sdb->zone, namestr, sdb->dbdata, node, methods, clientinfo); MAYBE_UNLOCK(sdb);