From: Tinderbox User Date: Wed, 2 Nov 2016 23:46:39 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.12.0a1~672 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e37bc34b317d9d81d3974b448917809ad2dd7d54;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf index b0d46ce1e74..79fa7c9efe1 100644 --- a/bin/tests/system/xfer/ns1/named.conf +++ b/bin/tests/system/xfer/ns1/named.conf @@ -42,12 +42,12 @@ zone "edns-expire" { }; zone "axfr-too-big" { - type master; - file "axfr-too-big.db"; + type master; + file "axfr-too-big.db"; }; zone "ixfr-too-big" { - type master; + type master; allow-update { any; }; - file "ixfr-too-big.db"; + file "ixfr-too-big.db"; }; diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 10c598a320e..4550fdfff4e 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1757,7 +1757,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, { "masters", SLAVEZONE | STUBZONE | REDIRECTZONE }, { "max-ixfr-log-size", MASTERZONE | SLAVEZONE | STREDIRECTZONE }, { "max-records", MASTERZONE | SLAVEZONE | STUBZONE | STREDIRECTZONE | - STATICSTUBZONE | REDIRECTZONE }, + STATICSTUBZONE | REDIRECTZONE }, { "max-refresh-time", SLAVEZONE | STUBZONE | STREDIRECTZONE }, { "max-retry-time", SLAVEZONE | STUBZONE | STREDIRECTZONE }, { "max-transfer-idle-in", SLAVEZONE | STUBZONE | STREDIRECTZONE }, diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 59b2dc4c9a7..b2bcb004fc5 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -1505,7 +1505,7 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, - isc_uint64_t *bytes); + isc_uint64_t *bytes); /*%< * Get the number of records in the given version of the database as well * as the number bytes used to store those records. diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 4f78bc4911b..5323b23be4f 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -7984,7 +7984,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, static isc_result_t getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, - isc_uint64_t *bytes) + isc_uint64_t *bytes) { dns_rbtdb_t *rbtdb; isc_result_t result = ISC_R_SUCCESS; diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 2b4e76ddba4..b6b727cc5b2 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -10218,14 +10218,14 @@ dns_zone_setmaxretrytime(dns_zone_t *zone, isc_uint32_t val) { isc_uint32_t dns_zone_getmaxrecords(dns_zone_t *zone) { - REQUIRE(DNS_ZONE_VALID(zone)); + REQUIRE(DNS_ZONE_VALID(zone)); return (zone->maxrecords); } void dns_zone_setmaxrecords(dns_zone_t *zone, isc_uint32_t val) { - REQUIRE(DNS_ZONE_VALID(zone)); + REQUIRE(DNS_ZONE_VALID(zone)); zone->maxrecords = val; } diff --git a/lib/isc/random.c b/lib/isc/random.c index 826e50d6dcb..c7bfcdf566c 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -109,12 +109,12 @@ isc_random_seed(isc_uint32_t seed) { arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t)); #else /* - * If arcrandom() is available and no corresponding seeding - * function arc4random_addrandom() is available, no seeding is - * done on such platforms (e.g., OpenBSD 5.5). This is because - * the OS itself is supposed to seed the RNG and it is assumed - * that no explicit seeding is required. - */ + * If arcrandom() is available and no corresponding seeding + * function arc4random_addrandom() is available, no seeding is + * done on such platforms (e.g., OpenBSD 5.5). This is because + * the OS itself is supposed to seed the RNG and it is assumed + * that no explicit seeding is required. + */ UNUSED(seed); #endif }