summaryrefslogtreecommitdiffstats
path: root/bind97-cleanup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'bind97-cleanup.patch')
-rw-r--r--bind97-cleanup.patch452
1 files changed, 0 insertions, 452 deletions
diff --git a/bind97-cleanup.patch b/bind97-cleanup.patch
deleted file mode 100644
index 90dcf19..0000000
--- a/bind97-cleanup.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-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;
- int tempnamekeylen;
-- char *x;
- char *cp;
- isc_uint32_t which;
-
-@@ -4323,11 +4322,11 @@ opentmpkey(isc_mem_t *mctx, const char *
- return (ISC_R_FAILURE);
- }
-
-- x = cp--;
-+ cp--;
- while (cp >= tempname && *cp == 'X') {
- isc_random_get(&which);
- *cp = alphnum[which % (sizeof(alphnum) - 1)];
-- x = cp--;
-+ cp--;
- }
-
- tempnamekeylen = tempnamelen+5;
-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;
- isc_boolean_t goodksk = ISC_FALSE;
-- isc_boolean_t goodzsk = ISC_FALSE;
- isc_result_t result;
- unsigned char revoked_ksk[256];
- unsigned char revoked_zsk[256];
-@@ -1569,7 +1568,6 @@ verifyzone(void) {
- #endif
- if (zsk_algorithms[dnskey.algorithm] != 255)
- zsk_algorithms[dnskey.algorithm]++;
-- goodzsk = ISC_TRUE;
- } else {
- if (standby_zsk[dnskey.algorithm] != 255)
- standby_zsk[dnskey.algorithm]++;
-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;
-- const char *forview = " for view ";
- isc_boolean_t rfc1918;
- isc_boolean_t empty_zones_enable;
- const cfg_obj_t *disablelist = NULL;
-@@ -1718,7 +1717,6 @@ configure_view(dns_view_t *view, cfg_par
- if (!strcmp(viewname, "_default")) {
- sep = "";
- viewname = "";
-- forview = "";
- }
-
- /*
-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;
-
-+#if 0
- /* temporarily get a unique thread # */
- unsigned int dlz_thread_num = 1+(int) (1000.0*rand()/(RAND_MAX+1.0));
-+#endif
-
- REQUIRE(*rs == NULL);
-
-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;
-- dns_fixedname_t fkeyname;
-- dns_name_t *keyname;
- isc_buffer_t keydatabuf;
- isc_region_t r;
- isc_result_t result = ISC_R_SUCCESS;
-@@ -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"));
-- keyname = dns_fixedname_name(&fkeyname);
- keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
-
- if (flags > 0xffff) {
-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;
-- isc_boolean_t result;
- dns_adbname_t *victim, *next_victim;
- isc_boolean_t overmem = isc_mem_isovermem(adb->mctx);
- int scans = 0;
-@@ -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);
-- result = check_expire_name(&victim, now);
-+ (void) check_expire_name(&victim, now);
- if (victim == NULL) {
- victims++;
- goto next;
-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;
- dns_rdataset_t *modified = NULL;
-- isc_boolean_t offline;
-
- op = t->op;
- type = t->rdata.type;
-@@ -301,7 +300,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d
- CHECK(dns_db_findnsec3node(db, name, ISC_TRUE,
- &node));
-
-- offline = ISC_FALSE;
- while (t != NULL &&
- dns_name_equal(&t->name, name) &&
- t->op == op &&
-@@ -323,8 +321,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d
- namebuf, typebuf, classbuf,
- (unsigned long) t->ttl,
- (unsigned long) rdl.ttl);
-- if (t->rdata.flags & DNS_RDATA_OFFLINE)
-- offline = ISC_TRUE;
- ISC_LIST_APPEND(rdl.rdata, &t->rdata, link);
- t = ISC_LIST_NEXT(t, link);
- }
-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)
- {
-- isc_result_t result;
- dns_dnsseckey_t *dk;
- int major, minor;
-
-@@ -1094,7 +1093,7 @@ dns_dnsseckey_create(isc_mem_t *mctx, ds
- dk->ksk = ISC_TF((dst_key_flags(dk->key) & DNS_KEYFLAG_KSK) != 0);
-
- /* Is this an old-style key? */
-- result = dst_key_getprivateformat(dk->key, &major, &minor);
-+ (void) dst_key_getprivateformat(dk->key, &major, &minor);
-
- /* Smart signing started with key format 1.3 */
- dk->legacy = ISC_TF(major == 1 && minor <= 2);
-@@ -1673,9 +1672,6 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_
-
- /* No match found in keys; add the new key. */
- if (key2 == NULL) {
-- dns_dnsseckey_t *next;
--
-- next = ISC_LIST_NEXT(key1, link);
- ISC_LIST_UNLINK(*newkeys, key1, link);
- ISC_LIST_APPEND(*keys, key1, link);
-
-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;
-- isc_result_t result;
-
- if (!dns_name_isabsolute(name))
- namep = name;
-@@ -134,7 +133,7 @@ name_to_gbuffer(dns_name_t *name, isc_bu
- namep = &tname;
- }
-
-- result = dns_name_toprincipal(namep, buffer);
-+ (void) dns_name_toprincipal(namep, buffer);
- isc_buffer_putuint8(buffer, 0);
- isc_buffer_usedregion(buffer, &r);
- REGION_TO_GBUFFER(r, *gbuffer);
-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;
- unsigned char c;
-- int length;
-
- REQUIRE(type == 32769);
-
-@@ -71,23 +70,6 @@ fromtext_dlv(ARGS_FROMTEXT) {
- RETERR(uint8_tobuffer(token.value.as_ulong, target));
- c = (unsigned char) token.value.as_ulong;
-
-- /*
-- * Digest.
-- */
-- switch (c) {
-- case DNS_DSDIGEST_SHA1:
-- length = ISC_SHA1_DIGESTLENGTH;
-- break;
-- case DNS_DSDIGEST_SHA256:
-- length = ISC_SHA256_DIGESTLENGTH;
-- 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.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;
- isc_result_t result;
-- unsigned int dispattr;
-
- req_log(ISC_LOG_DEBUG(3), "req_send: request %p", request);
-
- REQUIRE(VALID_REQUEST(request));
-- dispattr = dns_dispatch_getattributes(request->dispatch);
- socket = req_getsocket(request);
- isc_buffer_usedregion(request->query, &r);
- /*
-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;
- unsigned char output[4096];
-- isc_result_t result;
-
- isc_buffer_init(&outbuf, output, sizeof(output));
-- result = dns_message_totext(msg, &dns_master_style_debug, 0,
-+ (void) dns_message_totext(msg, &dns_master_style_debug, 0,
- &outbuf);
- /* XXXMLG ignore result */
- fprintf(stderr, "%.*s\n", (int)isc_buffer_usedlength(&outbuf),
-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;
-- dns_rdataset_t *sigrdataset;
- isc_boolean_t want_destroy;
- isc_result_t result;
- isc_boolean_t exists, data;
-@@ -1241,7 +1240,6 @@ authvalidated(isc_task_t *task, isc_even
-
- devent = (dns_validatorevent_t *)event;
- rdataset = devent->rdataset;
-- sigrdataset = devent->sigrdataset;
- val = devent->ev_arg;
- result = devent->result;
- dns_validator_destroy(&val->subvalidator);
-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;
-- isc_boolean_t check_ksk, keyset_kskonly, is_ksk;
-+ isc_boolean_t check_ksk, keyset_kskonly;
- isc_boolean_t delegation;
- isc_boolean_t first;
- isc_result_t result;
-- isc_stdtime_t now, inception, soaexpire, expire, stop;
-+ isc_stdtime_t now, inception, soaexpire, expire;
- isc_uint32_t jitter;
- unsigned int i;
- unsigned int nkeys = 0;
-@@ -5737,7 +5737,6 @@ zone_nsec3chain(dns_zone_t *zone) {
- */
- isc_random_get(&jitter);
- expire = soaexpire - jitter % 3600;
-- stop = now + 5;
-
- check_ksk = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_UPDATECHECKKSK);
- keyset_kskonly = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_DNSKEYKSKONLY);
-@@ -5783,7 +5782,6 @@ zone_nsec3chain(dns_zone_t *zone) {
- if (NSEC3REMOVE(nsec3chain->nsec3param.flags))
- goto next_addchain;
-
-- is_ksk = ISC_FALSE;
- delegation = ISC_FALSE;
- dns_dbiterator_current(nsec3chain->dbiterator, &node, name);
-
-@@ -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;
-- isc_stdtime_t now, inception, soaexpire, expire, stop;
-+ isc_stdtime_t now, inception, soaexpire, expire;
- isc_uint32_t jitter;
- unsigned int i, j;
- unsigned int nkeys = 0;
- isc_uint32_t nodes;
-- isc_boolean_t was_ksk;
-
- dns_rdataset_init(&rdataset);
- dns_fixedname_init(&fixed);
-@@ -6559,7 +6556,6 @@ zone_sign(dns_zone_t *zone) {
- */
- isc_random_get(&jitter);
- expire = soaexpire - jitter % 3600;
-- stop = now + 5;
-
- /*
- * We keep pulling nodes off each iterator in turn until
-@@ -6604,8 +6600,6 @@ zone_sign(dns_zone_t *zone) {
-
- delegation = ISC_FALSE;
-
-- was_ksk = ISC_FALSE;
--
- if (first && signing->delete) {
- /*
- * Remove the key we are deleting from consideration.
-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;
- isc_region_t r;
-- isc_result_t result;
- isc_socketevent_t *sev = (isc_socketevent_t *)ev;
-
- ENTER("senddone");
-@@ -963,8 +962,8 @@ isc_httpd_senddone(isc_task_t *task, isc
-
- r.base = (unsigned char *)httpd->recvbuf;
- r.length = HTTP_RECVLEN - 1;
-- result = isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone,
-- httpd);
-+ (void) isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone,
-+ httpd);
-
- out:
- isc_event_free(&ev);
-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, ...) {
- va_list args;
-- size_t n;
-
- REQUIRE(size > 0U);
-
- va_start(args, format);
-- n = vsnprintf(target, size, format, args);
-+ (void) vsnprintf(target, size, format, args);
- va_end(args);
-
- ENSURE(strlen(target) < size);
-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
- deschedule(isc__timer_t *timer) {
-+#ifdef USE_TIMER_THREAD
- isc_boolean_t need_wakeup = ISC_FALSE;
-+#endif /* USE_TIMER_THREAD */
- isc__timermgr_t *manager;
-
- /*
-@@ -342,8 +344,10 @@ deschedule(isc__timer_t *timer) {
-
- manager = timer->manager;
- if (timer->index > 0) {
-+#ifdef USE_TIMER_THREAD
- if (timer->index == 1)
- need_wakeup = ISC_TRUE;
-+#endif /* USE_TIMER_THREAD */
- isc_heap_delete(manager->heap, timer->index);
- timer->index = 0;
- INSIST(manager->nscheduled > 0);
-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;
-- isc_sockettype_t type;
-
- REQUIRE(VALID_SOCKET(sock));
-
-@@ -2772,7 +2771,6 @@ isc__socket_close(isc_socket_t *sock0) {
- INSIST(sock->connect_ev == NULL);
-
- manager = sock->manager;
-- type = sock->type;
- fd = sock->fd;
- sock->fd = -1;
- memset(sock->name, 0, sizeof(sock->name));
-@@ -3690,7 +3688,6 @@ static isc_threadresult_t
- watcher(void *uap) {
- isc__socketmgr_t *manager = uap;
- isc_boolean_t done;
-- int ctlfd;
- int cc;
- #ifdef USE_KQUEUE
- const char *fnname = "kevent()";
-@@ -3702,6 +3699,7 @@ watcher(void *uap) {
- #elif defined (USE_SELECT)
- const char *fnname = "select()";
- int maxfd;
-+ int ctlfd;
- #endif
- char strbuf[ISC_STRERRORSIZE];
- #ifdef ISC_SOCKET_USE_POLLWATCH
-@@ -3711,7 +3709,9 @@ watcher(void *uap) {
- /*
- * Get the control fd here. This will never change.
- */
-+#ifdef USE_SELECT
- ctlfd = manager->pipe_fds[0];
-+#endif
- done = ISC_FALSE;
- while (!done) {
- do {
generated by cgit (git 2.34.1) at 2024-06-17 11:15:51 +0000