diff options
Diffstat (limited to 'bind97-cleanup.patch')
| -rw-r--r-- | bind97-cleanup.patch | 166 |
1 files changed, 87 insertions, 79 deletions
diff --git a/bind97-cleanup.patch b/bind97-cleanup.patch index 6103237..90dcf19 100644 --- a/bind97-cleanup.patch +++ b/bind97-cleanup.patch @@ -1,6 +1,6 @@ -diff -up bind-9.7.3/bin/dig/dighost.c.cleanup bind-9.7.3/bin/dig/dighost.c ---- bind-9.7.3/bin/dig/dighost.c.cleanup 2011-02-18 15:28:59.505352049 +0100 -+++ bind-9.7.3/bin/dig/dighost.c 2011-02-18 15:29:22.065302188 +0100 +diff -up bind-9.8.0rc1/bin/dig/dighost.c.cleanup bind-9.8.0rc1/bin/dig/dighost.c +--- bind-9.8.0rc1/bin/dig/dighost.c.cleanup 2011-02-21 16:30:33.188433480 +0100 ++++ bind-9.8.0rc1/bin/dig/dighost.c 2011-02-21 16:30:33.198433459 +0100 @@ -4300,7 +4300,6 @@ opentmpkey(isc_mem_t *mctx, const char * char *tempnamekey = NULL; int tempnamelen; @@ -23,9 +23,9 @@ diff -up bind-9.7.3/bin/dig/dighost.c.cleanup bind-9.7.3/bin/dig/dighost.c } tempnamekeylen = tempnamelen+5; -diff -up bind-9.7.3/bin/dnssec/dnssec-signzone.c.cleanup bind-9.7.3/bin/dnssec/dnssec-signzone.c ---- bind-9.7.3/bin/dnssec/dnssec-signzone.c.cleanup 2011-02-18 15:29:34.615274529 +0100 -+++ bind-9.7.3/bin/dnssec/dnssec-signzone.c 2011-02-18 15:29:51.075239402 +0100 +diff -up bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c.cleanup bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c +--- bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c.cleanup 2010-06-04 01:51:04.000000000 +0200 ++++ bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c 2011-02-21 16:30:33.198433459 +0100 @@ -1467,7 +1467,6 @@ verifyzone(void) { isc_boolean_t done = ISC_FALSE; isc_boolean_t first = ISC_TRUE; @@ -42,10 +42,10 @@ diff -up bind-9.7.3/bin/dnssec/dnssec-signzone.c.cleanup bind-9.7.3/bin/dnssec/d } else { if (standby_zsk[dnskey.algorithm] != 255) standby_zsk[dnskey.algorithm]++; -diff -up bind-9.7.3/bin/named/server.c.cleanup bind-9.7.3/bin/named/server.c ---- bind-9.7.3/bin/named/server.c.cleanup 2011-02-18 15:27:38.565530746 +0100 -+++ bind-9.7.3/bin/named/server.c 2011-02-18 15:27:55.065494317 +0100 -@@ -1413,7 +1413,6 @@ configure_view(dns_view_t *view, cfg_par +diff -up bind-9.8.0rc1/bin/named/server.c.cleanup bind-9.8.0rc1/bin/named/server.c +--- bind-9.8.0rc1/bin/named/server.c.cleanup 2011-02-21 16:30:33.058433757 +0100 ++++ bind-9.8.0rc1/bin/named/server.c 2011-02-21 16:30:33.198433459 +0100 +@@ -1670,7 +1670,6 @@ configure_view(dns_view_t *view, cfg_par isc_uint32_t max_clients_per_query; const char *sep = ": view "; const char *viewname = view->name; @@ -53,7 +53,7 @@ diff -up bind-9.7.3/bin/named/server.c.cleanup bind-9.7.3/bin/named/server.c isc_boolean_t rfc1918; isc_boolean_t empty_zones_enable; const cfg_obj_t *disablelist = NULL; -@@ -1458,7 +1457,6 @@ configure_view(dns_view_t *view, cfg_par +@@ -1718,7 +1717,6 @@ configure_view(dns_view_t *view, cfg_par if (!strcmp(viewname, "_default")) { sep = ""; viewname = ""; @@ -61,9 +61,9 @@ diff -up bind-9.7.3/bin/named/server.c.cleanup bind-9.7.3/bin/named/server.c } /* -diff -up bind-9.7.3/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup bind-9.7.3/contrib/dlz/drivers/dlz_postgres_driver.c ---- bind-9.7.3/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup 2011-02-18 15:28:16.135447795 +0100 -+++ bind-9.7.3/contrib/dlz/drivers/dlz_postgres_driver.c 2011-02-18 15:28:43.815387080 +0100 +diff -up bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c +--- bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup 2010-12-18 02:56:21.000000000 +0100 ++++ bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c 2011-02-21 16:30:33.198433459 +0100 @@ -292,8 +292,10 @@ postgres_get_resultset(const char *zone, unsigned int i = 0; unsigned int j = 0; @@ -75,10 +75,10 @@ diff -up bind-9.7.3/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup bind-9.7.3 REQUIRE(*rs == NULL); -diff -up bind-9.7.3/lib/bind9/check.c.cleanup bind-9.7.3/lib/bind9/check.c ---- bind-9.7.3/lib/bind9/check.c.cleanup 2011-02-18 15:26:31.305679252 +0100 -+++ bind-9.7.3/lib/bind9/check.c 2011-02-18 15:27:21.205572047 +0100 -@@ -1818,8 +1818,6 @@ check_trusted_key(const cfg_obj_t *key, +diff -up bind-9.8.0rc1/lib/bind9/check.c.cleanup bind-9.8.0rc1/lib/bind9/check.c +--- bind-9.8.0rc1/lib/bind9/check.c.cleanup 2011-01-08 00:47:07.000000000 +0100 ++++ bind-9.8.0rc1/lib/bind9/check.c 2011-02-21 16:30:33.198433459 +0100 +@@ -1997,8 +1997,6 @@ check_trusted_key(const cfg_obj_t *key, isc_log_t *logctx) { const char *keystr, *keynamestr; @@ -87,7 +87,7 @@ diff -up bind-9.7.3/lib/bind9/check.c.cleanup bind-9.7.3/lib/bind9/check.c isc_buffer_t keydatabuf; isc_region_t r; isc_result_t result = ISC_R_SUCCESS; -@@ -1830,7 +1828,6 @@ check_trusted_key(const cfg_obj_t *key, +@@ -2009,7 +2007,6 @@ check_trusted_key(const cfg_obj_t *key, flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags")); proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol")); alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm")); @@ -95,10 +95,10 @@ diff -up bind-9.7.3/lib/bind9/check.c.cleanup bind-9.7.3/lib/bind9/check.c keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name")); if (flags > 0xffff) { -diff -up bind-9.7.3/lib/dns/adb.c.cleanup bind-9.7.3/lib/dns/adb.c ---- bind-9.7.3/lib/dns/adb.c.cleanup 2011-02-18 15:18:50.436696481 +0100 -+++ bind-9.7.3/lib/dns/adb.c 2011-02-18 15:19:16.686638556 +0100 -@@ -1853,7 +1853,6 @@ check_expire_name(dns_adbname_t **namep, +diff -up bind-9.8.0rc1/lib/dns/adb.c.cleanup bind-9.8.0rc1/lib/dns/adb.c +--- bind-9.8.0rc1/lib/dns/adb.c.cleanup 2010-12-22 00:47:08.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/adb.c 2011-02-21 16:30:33.198433459 +0100 +@@ -2195,7 +2195,6 @@ check_expire_name(dns_adbname_t **namep, static void check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) { int victims, max_victims; @@ -106,7 +106,7 @@ diff -up bind-9.7.3/lib/dns/adb.c.cleanup bind-9.7.3/lib/dns/adb.c dns_adbname_t *victim, *next_victim; isc_boolean_t overmem = isc_mem_isovermem(adb->mctx); int scans = 0; -@@ -1875,7 +1874,7 @@ check_stale_name(dns_adb_t *adb, int buc +@@ -2217,7 +2216,7 @@ check_stale_name(dns_adb_t *adb, int buc INSIST(!NAME_DEAD(victim)); scans++; next_victim = ISC_LIST_PREV(victim, plink); @@ -115,9 +115,9 @@ diff -up bind-9.7.3/lib/dns/adb.c.cleanup bind-9.7.3/lib/dns/adb.c if (victim == NULL) { victims++; goto next; -diff -up bind-9.7.3/lib/dns/diff.c.cleanup bind-9.7.3/lib/dns/diff.c ---- bind-9.7.3/lib/dns/diff.c.cleanup 2011-02-18 15:20:02.006538543 +0100 -+++ bind-9.7.3/lib/dns/diff.c 2011-02-18 15:20:28.426480612 +0100 +diff -up bind-9.8.0rc1/lib/dns/diff.c.cleanup bind-9.8.0rc1/lib/dns/diff.c +--- bind-9.8.0rc1/lib/dns/diff.c.cleanup 2009-12-01 01:47:09.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/diff.c 2011-02-21 16:30:33.198433459 +0100 @@ -264,7 +264,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d dns_rdataset_t rds; dns_rdataset_t ardataset; @@ -143,9 +143,9 @@ diff -up bind-9.7.3/lib/dns/diff.c.cleanup bind-9.7.3/lib/dns/diff.c ISC_LIST_APPEND(rdl.rdata, &t->rdata, link); t = ISC_LIST_NEXT(t, link); } -diff -up bind-9.7.3/lib/dns/dnssec.c.cleanup bind-9.7.3/lib/dns/dnssec.c ---- bind-9.7.3/lib/dns/dnssec.c.cleanup 2011-02-18 15:20:39.306456222 +0100 -+++ bind-9.7.3/lib/dns/dnssec.c 2011-02-18 15:21:31.896340160 +0100 +diff -up bind-9.8.0rc1/lib/dns/dnssec.c.cleanup bind-9.8.0rc1/lib/dns/dnssec.c +--- bind-9.8.0rc1/lib/dns/dnssec.c.cleanup 2010-01-14 00:48:59.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/dnssec.c 2011-02-21 16:30:33.208433438 +0100 @@ -1068,7 +1068,6 @@ isc_result_t dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey, dns_dnsseckey_t **dkp) @@ -173,10 +173,10 @@ diff -up bind-9.7.3/lib/dns/dnssec.c.cleanup bind-9.7.3/lib/dns/dnssec.c ISC_LIST_UNLINK(*newkeys, key1, link); ISC_LIST_APPEND(*keys, key1, link); -diff -up bind-9.7.3/lib/dns/gssapictx.c.cleanup bind-9.7.3/lib/dns/gssapictx.c ---- bind-9.7.3/lib/dns/gssapictx.c.cleanup 2011-02-18 15:25:53.975761658 +0100 -+++ bind-9.7.3/lib/dns/gssapictx.c 2011-02-18 15:26:05.945735228 +0100 -@@ -119,7 +119,6 @@ name_to_gbuffer(dns_name_t *name, isc_bu +diff -up bind-9.8.0rc1/lib/dns/gssapictx.c.cleanup bind-9.8.0rc1/lib/dns/gssapictx.c +--- bind-9.8.0rc1/lib/dns/gssapictx.c.cleanup 2011-01-10 04:49:49.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/gssapictx.c 2011-02-21 16:30:33.208433438 +0100 +@@ -121,7 +121,6 @@ name_to_gbuffer(dns_name_t *name, isc_bu { dns_name_t tname, *namep; isc_region_t r; @@ -184,7 +184,7 @@ diff -up bind-9.7.3/lib/dns/gssapictx.c.cleanup bind-9.7.3/lib/dns/gssapictx.c if (!dns_name_isabsolute(name)) namep = name; -@@ -132,7 +131,7 @@ name_to_gbuffer(dns_name_t *name, isc_bu +@@ -134,7 +133,7 @@ name_to_gbuffer(dns_name_t *name, isc_bu namep = &tname; } @@ -193,9 +193,9 @@ diff -up bind-9.7.3/lib/dns/gssapictx.c.cleanup bind-9.7.3/lib/dns/gssapictx.c isc_buffer_putuint8(buffer, 0); isc_buffer_usedregion(buffer, &r); REGION_TO_GBUFFER(r, *gbuffer); -diff -up bind-9.7.3/lib/dns/rdata/generic/dlv_32769.c.cleanup bind-9.7.3/lib/dns/rdata/generic/dlv_32769.c ---- bind-9.7.3/lib/dns/rdata/generic/dlv_32769.c.cleanup 2011-02-18 15:22:02.456272719 +0100 -+++ bind-9.7.3/lib/dns/rdata/generic/dlv_32769.c 2011-02-18 15:22:27.126218257 +0100 +diff -up bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c.cleanup bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c +--- bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c.cleanup 2010-12-24 00:47:08.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c 2011-02-21 16:32:03.818238782 +0100 @@ -33,7 +33,6 @@ static inline isc_result_t fromtext_dlv(ARGS_FROMTEXT) { isc_token_t token; @@ -204,25 +204,33 @@ diff -up bind-9.7.3/lib/dns/rdata/generic/dlv_32769.c.cleanup bind-9.7.3/lib/dns REQUIRE(type == 32769); -@@ -71,15 +70,6 @@ fromtext_dlv(ARGS_FROMTEXT) { +@@ -71,23 +70,6 @@ fromtext_dlv(ARGS_FROMTEXT) { RETERR(uint8_tobuffer(token.value.as_ulong, target)); c = (unsigned char) token.value.as_ulong; - /* - * Digest. - */ -- if (c == DNS_DSDIGEST_SHA1) +- switch (c) { +- case DNS_DSDIGEST_SHA1: - length = ISC_SHA1_DIGESTLENGTH; -- else if (c == DNS_DSDIGEST_SHA256) +- break; +- case DNS_DSDIGEST_SHA256: - length = ISC_SHA256_DIGESTLENGTH; -- else +- break; +- case DNS_DSDIGEST_GOST: +- length = ISC_GOST_DIGESTLENGTH; +- break; +- default: - length = -1; +- break; +- } return (isc_hex_tobuffer(lexer, target, -1)); } -diff -up bind-9.7.3/lib/dns/request.c.cleanup bind-9.7.3/lib/dns/request.c ---- bind-9.7.3/lib/dns/request.c.cleanup 2011-02-18 15:22:40.566188593 +0100 -+++ bind-9.7.3/lib/dns/request.c 2011-02-18 15:23:25.766088820 +0100 +diff -up bind-9.8.0rc1/lib/dns/request.c.cleanup bind-9.8.0rc1/lib/dns/request.c +--- bind-9.8.0rc1/lib/dns/request.c.cleanup 2010-03-05 00:50:34.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/request.c 2011-02-21 16:30:33.208433438 +0100 @@ -428,12 +428,10 @@ req_send(dns_request_t *request, isc_tas isc_region_t r; isc_socket_t *socket; @@ -236,9 +244,9 @@ diff -up bind-9.7.3/lib/dns/request.c.cleanup bind-9.7.3/lib/dns/request.c socket = req_getsocket(request); isc_buffer_usedregion(request->query, &r); /* -diff -up bind-9.7.3/lib/dns/tkey.c.cleanup bind-9.7.3/lib/dns/tkey.c ---- bind-9.7.3/lib/dns/tkey.c.cleanup 2011-02-18 15:23:35.386067584 +0100 -+++ bind-9.7.3/lib/dns/tkey.c 2011-02-18 15:23:52.796029159 +0100 +diff -up bind-9.8.0rc1/lib/dns/tkey.c.cleanup bind-9.8.0rc1/lib/dns/tkey.c +--- bind-9.8.0rc1/lib/dns/tkey.c.cleanup 2011-01-09 00:47:01.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/tkey.c 2011-02-21 16:30:33.208433438 +0100 @@ -70,10 +70,9 @@ static void _dns_tkey_dumpmessage(dns_message_t *msg) { isc_buffer_t outbuf; @@ -251,10 +259,10 @@ diff -up bind-9.7.3/lib/dns/tkey.c.cleanup bind-9.7.3/lib/dns/tkey.c &outbuf); /* XXXMLG ignore result */ fprintf(stderr, "%.*s\n", (int)isc_buffer_usedlength(&outbuf), -diff -up bind-9.7.3/lib/dns/validator.c.cleanup bind-9.7.3/lib/dns/validator.c ---- bind-9.7.3/lib/dns/validator.c.cleanup 2011-02-18 15:24:02.276008230 +0100 -+++ bind-9.7.3/lib/dns/validator.c 2011-02-18 15:24:20.245971006 +0100 -@@ -1223,7 +1223,6 @@ authvalidated(isc_task_t *task, isc_even +diff -up bind-9.8.0rc1/lib/dns/validator.c.cleanup bind-9.8.0rc1/lib/dns/validator.c +--- bind-9.8.0rc1/lib/dns/validator.c.cleanup 2010-12-23 05:07:58.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/validator.c 2011-02-21 16:30:33.208433438 +0100 +@@ -1231,7 +1231,6 @@ authvalidated(isc_task_t *task, isc_even dns_validatorevent_t *devent; dns_validator_t *val; dns_rdataset_t *rdataset; @@ -262,7 +270,7 @@ diff -up bind-9.7.3/lib/dns/validator.c.cleanup bind-9.7.3/lib/dns/validator.c isc_boolean_t want_destroy; isc_result_t result; isc_boolean_t exists, data; -@@ -1233,7 +1232,6 @@ authvalidated(isc_task_t *task, isc_even +@@ -1241,7 +1240,6 @@ authvalidated(isc_task_t *task, isc_even devent = (dns_validatorevent_t *)event; rdataset = devent->rdataset; @@ -270,10 +278,10 @@ diff -up bind-9.7.3/lib/dns/validator.c.cleanup bind-9.7.3/lib/dns/validator.c val = devent->ev_arg; result = devent->result; dns_validator_destroy(&val->subvalidator); -diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c ---- bind-9.7.3/lib/dns/zone.c.cleanup 2011-02-18 15:24:33.825938590 +0100 -+++ bind-9.7.3/lib/dns/zone.c 2011-02-18 15:25:38.275796311 +0100 -@@ -5647,11 +5647,11 @@ zone_nsec3chain(dns_zone_t *zone) { +diff -up bind-9.8.0rc1/lib/dns/zone.c.cleanup bind-9.8.0rc1/lib/dns/zone.c +--- bind-9.8.0rc1/lib/dns/zone.c.cleanup 2011-02-07 01:14:30.000000000 +0100 ++++ bind-9.8.0rc1/lib/dns/zone.c 2011-02-21 16:30:33.208433438 +0100 +@@ -5668,11 +5668,11 @@ zone_nsec3chain(dns_zone_t *zone) { dns_nsec3chainlist_t cleanup; dst_key_t *zone_keys[MAXZONEKEYS]; isc_int32_t signatures; @@ -287,7 +295,7 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c isc_uint32_t jitter; unsigned int i; unsigned int nkeys = 0; -@@ -5716,7 +5716,6 @@ zone_nsec3chain(dns_zone_t *zone) { +@@ -5737,7 +5737,6 @@ zone_nsec3chain(dns_zone_t *zone) { */ isc_random_get(&jitter); expire = soaexpire - jitter % 3600; @@ -295,7 +303,7 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c check_ksk = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_UPDATECHECKKSK); keyset_kskonly = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_DNSKEYKSKONLY); -@@ -5762,7 +5761,6 @@ zone_nsec3chain(dns_zone_t *zone) { +@@ -5783,7 +5782,6 @@ zone_nsec3chain(dns_zone_t *zone) { if (NSEC3REMOVE(nsec3chain->nsec3param.flags)) goto next_addchain; @@ -303,7 +311,7 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c delegation = ISC_FALSE; dns_dbiterator_current(nsec3chain->dbiterator, &node, name); -@@ -6481,12 +6479,11 @@ zone_sign(dns_zone_t *zone) { +@@ -6502,12 +6500,11 @@ zone_sign(dns_zone_t *zone) { isc_boolean_t build_nsec3 = ISC_FALSE; isc_boolean_t first; isc_result_t result; @@ -317,7 +325,7 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c dns_rdataset_init(&rdataset); dns_fixedname_init(&fixed); -@@ -6538,7 +6535,6 @@ zone_sign(dns_zone_t *zone) { +@@ -6559,7 +6556,6 @@ zone_sign(dns_zone_t *zone) { */ isc_random_get(&jitter); expire = soaexpire - jitter % 3600; @@ -325,7 +333,7 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c /* * We keep pulling nodes off each iterator in turn until -@@ -6583,8 +6579,6 @@ zone_sign(dns_zone_t *zone) { +@@ -6604,8 +6600,6 @@ zone_sign(dns_zone_t *zone) { delegation = ISC_FALSE; @@ -334,9 +342,9 @@ diff -up bind-9.7.3/lib/dns/zone.c.cleanup bind-9.7.3/lib/dns/zone.c if (first && signing->delete) { /* * Remove the key we are deleting from consideration. -diff -up bind-9.7.3/lib/isc/httpd.c.cleanup bind-9.7.3/lib/isc/httpd.c ---- bind-9.7.3/lib/isc/httpd.c.cleanup 2011-02-18 15:17:22.936889562 +0100 -+++ bind-9.7.3/lib/isc/httpd.c 2011-02-18 15:17:55.846816943 +0100 +diff -up bind-9.8.0rc1/lib/isc/httpd.c.cleanup bind-9.8.0rc1/lib/isc/httpd.c +--- bind-9.8.0rc1/lib/isc/httpd.c.cleanup 2010-11-16 06:38:31.000000000 +0100 ++++ bind-9.8.0rc1/lib/isc/httpd.c 2011-02-21 16:30:33.208433438 +0100 @@ -912,7 +912,6 @@ isc_httpd_senddone(isc_task_t *task, isc { isc_httpd_t *httpd = ev->ev_arg; @@ -356,9 +364,9 @@ diff -up bind-9.7.3/lib/isc/httpd.c.cleanup bind-9.7.3/lib/isc/httpd.c out: isc_event_free(&ev); -diff -up bind-9.7.3/lib/isc/string.c.cleanup bind-9.7.3/lib/isc/string.c ---- bind-9.7.3/lib/isc/string.c.cleanup 2011-02-18 15:18:09.786786183 +0100 -+++ bind-9.7.3/lib/isc/string.c 2011-02-18 15:18:31.016739337 +0100 +diff -up bind-9.8.0rc1/lib/isc/string.c.cleanup bind-9.8.0rc1/lib/isc/string.c +--- bind-9.8.0rc1/lib/isc/string.c.cleanup 2007-06-20 01:47:17.000000000 +0200 ++++ bind-9.8.0rc1/lib/isc/string.c 2011-02-21 16:30:33.208433438 +0100 @@ -167,12 +167,11 @@ isc_string_printf(char *target, size_t s void isc_string_printf_truncate(char *target, size_t size, const char *format, ...) { @@ -373,9 +381,9 @@ diff -up bind-9.7.3/lib/isc/string.c.cleanup bind-9.7.3/lib/isc/string.c va_end(args); ENSURE(strlen(target) < size); -diff -up bind-9.7.3/lib/isc/timer.c.cleanup bind-9.7.3/lib/isc/timer.c ---- bind-9.7.3/lib/isc/timer.c.cleanup 2011-02-18 15:30:32.385146946 +0100 -+++ bind-9.7.3/lib/isc/timer.c 2011-02-18 15:31:22.585036094 +0100 +diff -up bind-9.8.0rc1/lib/isc/timer.c.cleanup bind-9.8.0rc1/lib/isc/timer.c +--- bind-9.8.0rc1/lib/isc/timer.c.cleanup 2011-02-03 06:50:07.000000000 +0100 ++++ bind-9.8.0rc1/lib/isc/timer.c 2011-02-21 16:30:33.208433438 +0100 @@ -333,7 +333,9 @@ schedule(isc__timer_t *timer, isc_time_t static inline void @@ -397,10 +405,10 @@ diff -up bind-9.7.3/lib/isc/timer.c.cleanup bind-9.7.3/lib/isc/timer.c isc_heap_delete(manager->heap, timer->index); timer->index = 0; INSIST(manager->nscheduled > 0); -diff -up bind-9.7.3/lib/isc/unix/socket.c.cleanup bind-9.7.3/lib/isc/unix/socket.c ---- bind-9.7.3/lib/isc/unix/socket.c.cleanup 2011-02-18 15:15:10.247182323 +0100 -+++ bind-9.7.3/lib/isc/unix/socket.c 2011-02-18 15:16:48.806964868 +0100 -@@ -2751,7 +2751,6 @@ isc__socket_close(isc_socket_t *sock0) { +diff -up bind-9.8.0rc1/lib/isc/unix/socket.c.cleanup bind-9.8.0rc1/lib/isc/unix/socket.c +--- bind-9.8.0rc1/lib/isc/unix/socket.c.cleanup 2011-02-03 06:50:07.000000000 +0100 ++++ bind-9.8.0rc1/lib/isc/unix/socket.c 2011-02-21 16:30:33.208433438 +0100 +@@ -2752,7 +2752,6 @@ isc__socket_close(isc_socket_t *sock0) { isc__socket_t *sock = (isc__socket_t *)sock0; int fd; isc__socketmgr_t *manager; @@ -408,7 +416,7 @@ diff -up bind-9.7.3/lib/isc/unix/socket.c.cleanup bind-9.7.3/lib/isc/unix/socket REQUIRE(VALID_SOCKET(sock)); -@@ -2771,7 +2770,6 @@ isc__socket_close(isc_socket_t *sock0) { +@@ -2772,7 +2771,6 @@ isc__socket_close(isc_socket_t *sock0) { INSIST(sock->connect_ev == NULL); manager = sock->manager; @@ -416,7 +424,7 @@ diff -up bind-9.7.3/lib/isc/unix/socket.c.cleanup bind-9.7.3/lib/isc/unix/socket fd = sock->fd; sock->fd = -1; memset(sock->name, 0, sizeof(sock->name)); -@@ -3689,7 +3687,6 @@ static isc_threadresult_t +@@ -3690,7 +3688,6 @@ static isc_threadresult_t watcher(void *uap) { isc__socketmgr_t *manager = uap; isc_boolean_t done; @@ -424,7 +432,7 @@ diff -up bind-9.7.3/lib/isc/unix/socket.c.cleanup bind-9.7.3/lib/isc/unix/socket int cc; #ifdef USE_KQUEUE const char *fnname = "kevent()"; -@@ -3701,6 +3698,7 @@ watcher(void *uap) { +@@ -3702,6 +3699,7 @@ watcher(void *uap) { #elif defined (USE_SELECT) const char *fnname = "select()"; int maxfd; @@ -432,7 +440,7 @@ diff -up bind-9.7.3/lib/isc/unix/socket.c.cleanup bind-9.7.3/lib/isc/unix/socket #endif char strbuf[ISC_STRERRORSIZE]; #ifdef ISC_SOCKET_USE_POLLWATCH -@@ -3710,7 +3708,9 @@ watcher(void *uap) { +@@ -3711,7 +3709,9 @@ watcher(void *uap) { /* * Get the control fd here. This will never change. */ |
