From 953189d30eb801f6f040ab6e3d3c6a6c30add952 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 22 Apr 2014 23:45:19 +0000 Subject: [PATCH] update copyright notice --- bin/dig/dighost.c | 50 ++++++++++---------- bin/tests/system/masterformat/ns1/named.conf | 2 +- bin/tests/system/masterformat/ns2/named.conf | 32 ++++++------- bin/tests/system/masterformat/tests.sh | 2 +- lib/dns/include/dns/types.h | 2 +- lib/dns/tests/update_test.c | 2 +- lib/dns/update.c | 2 +- lib/lwres/include/lwres/lwres.h | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index e49b5538a0..3b26fb30e8 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -1486,37 +1486,37 @@ static unsigned char ednsoptscnt = 0; void save_opt(dig_lookup_t *lookup, char *code, char *value) { - isc_uint32_t num; - isc_buffer_t b; - isc_result_t result; + isc_uint32_t num; + isc_buffer_t b; + isc_result_t result; - if (ednsoptscnt == EDNSOPTS) - fatal("too many ednsopts"); + if (ednsoptscnt == EDNSOPTS) + fatal("too many ednsopts"); - result = parse_uint(&num, code, 65535, "ednsopt"); + result = parse_uint(&num, code, 65535, "ednsopt"); if (result != ISC_R_SUCCESS) fatal("bad edns code point: %s", code); - ednsopts[ednsoptscnt].code = num; - ednsopts[ednsoptscnt].length = 0; - ednsopts[ednsoptscnt].value = NULL; + ednsopts[ednsoptscnt].code = num; + ednsopts[ednsoptscnt].length = 0; + ednsopts[ednsoptscnt].value = NULL; - if (value != NULL) { - char *buf; - buf = isc_mem_allocate(mctx, strlen(value)/2 + 1); - if (buf == NULL) - fatal("out of memory"); - isc_buffer_init(&b, buf, strlen(value)/2 + 1); - result = isc_hex_decodestring(value, &b); - check_result(result, "isc_hex_decodestring"); - ednsopts[ednsoptscnt].value = isc_buffer_base(&b); - ednsopts[ednsoptscnt].length = isc_buffer_usedlength(&b); - } + if (value != NULL) { + char *buf; + buf = isc_mem_allocate(mctx, strlen(value)/2 + 1); + if (buf == NULL) + fatal("out of memory"); + isc_buffer_init(&b, buf, strlen(value)/2 + 1); + result = isc_hex_decodestring(value, &b); + check_result(result, "isc_hex_decodestring"); + ednsopts[ednsoptscnt].value = isc_buffer_base(&b); + ednsopts[ednsoptscnt].length = isc_buffer_usedlength(&b); + } - if (lookup->ednsoptscnt == 0) - lookup->ednsopts = &ednsopts[ednsoptscnt]; - lookup->ednsoptscnt++; - ednsoptscnt++; + if (lookup->ednsoptscnt == 0) + lookup->ednsopts = &ednsopts[ednsoptscnt]; + lookup->ednsoptscnt++; + ednsoptscnt++; } /*% @@ -2499,7 +2499,7 @@ setup_lookup(dig_lookup_t *lookup) { if (lookup->ednsoptscnt != 0) { memmove(&opts[i], lookup->ednsopts, - sizeof(dns_ednsopt_t) * lookup->ednsoptscnt); + sizeof(dns_ednsopt_t) * lookup->ednsoptscnt); i += lookup->ednsoptscnt; } diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf index d4ce644f05..0968e729e0 100644 --- a/bin/tests/system/masterformat/ns1/named.conf +++ b/bin/tests/system/masterformat/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2005, 2007, 2011-2014 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/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf index b1900579c3..8da301ef1f 100644 --- a/bin/tests/system/masterformat/ns2/named.conf +++ b/bin/tests/system/masterformat/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2005, 2007, 2011, 2012, 2014 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 @@ -22,7 +22,7 @@ options { pid-file "named.pid"; listen-on port 5300 { 10.53.0.2; }; listen-on-v6 { none; }; - port 5300; + port 5300; recursion no; notify no; dnssec-enable yes; @@ -34,22 +34,22 @@ zone "example" { }; zone "transfer1" { - type slave; - masters { 10.53.0.1; }; - file "transfer.db.raw"; + type slave; + masters { 10.53.0.1; }; + file "transfer.db.raw"; }; zone "transfer2" { - type slave; - masters { 10.53.0.1; }; - masterfile-format text; - file "transfer.db.txt"; + type slave; + masters { 10.53.0.1; }; + masterfile-format text; + file "transfer.db.txt"; }; zone "transfer3" { - type slave; - masters { 10.53.0.1; }; - file "formerly-text.db"; + type slave; + masters { 10.53.0.1; }; + file "formerly-text.db"; }; zone "transfer4" { @@ -61,8 +61,8 @@ zone "transfer4" { }; zone "large" { - type slave; - masters { 10.53.0.1; }; - masterfile-format raw; - file "large.bk"; + type slave; + masters { 10.53.0.1; }; + masterfile-format raw; + file "large.bk"; }; diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh index 1362a12b55..c8b2e0cfa2 100755 --- a/bin/tests/system/masterformat/tests.sh +++ b/bin/tests/system/masterformat/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2005, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2005, 2007, 2011-2014 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/types.h b/lib/dns/include/dns/types.h index 95c8f165e8..22a701f928 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c index 16de79fdb1..5631ad640e 100644 --- a/lib/dns/tests/update_test.c +++ b/lib/dns/tests/update_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011, 2012, 2014 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/update.c b/lib/dns/update.c index 7fccc87918..1805880327 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011-2014 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/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h index c83240cefb..69caac23fa 100644 --- a/lib/lwres/include/lwres/lwres.h +++ b/lib/lwres/include/lwres/lwres.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any