diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index c506da4a76..3c4b335d06 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -2502,7 +2502,7 @@ send_tcp_connect(dig_query_t *query) { send_tcp_connect(next); return; } - + INSIST(query->sock == NULL); result = isc_socket_create(socketmgr, isc_sockaddr_pf(&query->sockaddr), @@ -3100,7 +3100,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { UNLOCK_LOOKUP; return; } - + if (sevent->result != ISC_R_SUCCESS) { if (sevent->result == ISC_R_CANCELED) { debug("in recv cancel handler"); diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index 8aca3d65fc..f04440cfb5 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/tsig/ns1/example.db b/bin/tests/system/tsig/ns1/example.db index 3151b721db..c19ca48d25 100644 --- a/bin/tests/system/tsig/ns1/example.db +++ b/bin/tests/system/tsig/ns1/example.db @@ -1,4 +1,4 @@ -; Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2005-2007, 2009, 2012 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/message.c b/lib/dns/message.c index 6fc3a27d07..ef0bf6591b 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -2115,7 +2115,7 @@ dns_message_renderend(dns_message_t *msg) { * If we're adding a OPT, TSIG or SIG(0) to a truncated message, * clear all rdatasets from the message except for the question * before adding the OPT, TSIG or SIG(0). If the question doesn't - * fit, don't include it. + * fit, don't include it. */ if ((msg->tsigkey != NULL || msg->sig0key != NULL || msg->opt) && (msg->flags & DNS_MESSAGEFLAG_TC) != 0) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 2a06e63e21..bd3f5d1303 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -12455,7 +12455,7 @@ sync_secure_db(dns_zone_t *seczone, dns_db_t *secdb, ISC_LIST_UNLINK(diff->tuples, oldtuple, link); dns_difftuple_free(&oldtuple); } - + if (newtuple != NULL) { ISC_LIST_UNLINK(diff->tuples, newtuple, link); *soatuple = newtuple;