upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update copyright notice

Browse source
This commit is contained in:
Tinderbox User 2014-04-22 23:45:19 +00:00
parent 1a9932dde1
commit 953189d30e
8 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
bin/dig/dighost.c
View file

@ -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;
}

2
bin/tests/system/masterformat/ns1/named.conf
View file

@ -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

32
bin/tests/system/masterformat/ns2/named.conf
View file

@ -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";
};

2
bin/tests/system/masterformat/tests.sh
View file

@ -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

2
lib/dns/include/dns/types.h
View file

@ -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

2
lib/dns/tests/update_test.c
View file

@ -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

2
lib/dns/update.c
View file

@ -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

2
lib/lwres/include/lwres/lwres.h
View file

@ -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