From: Automatic Updater Date: Wed, 23 Jun 2010 23:46:36 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.7.1b1^2~65 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5b17e46285844a5292b15b4883898bf599442520;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 98d0fba829e..79a57292382 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2008, 2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.31.268.1 2010/06/22 04:02:40 marka Exp $ +# $Id: Makefile.in,v 1.31.268.2 2010/06/23 23:46:35 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index e825e1b0bbb..9fb12388ef5 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.413.14.9 2010/06/23 01:50:55 marka Exp $ */ +/* $Id: resolver.c,v 1.413.14.10 2010/06/23 23:46:36 tbox Exp $ */ /*! \file */ @@ -6166,22 +6166,22 @@ fctx_decreference(fetchctx_t *fctx) { INSIST(fctx->references > 0); fctx->references--; if (fctx->references == 0) { - /* - * No one cares about the result of this fetch anymore. - */ - if (fctx->pending == 0 && fctx->nqueries == 0 && - ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) { - /* - * This fctx is already shutdown; we were just - * waiting for the last reference to go away. - */ - bucket_empty = fctx_destroy(fctx); - } else { - /* - * Initiate shutdown. - */ - fctx_shutdown(fctx); - } + /* + * No one cares about the result of this fetch anymore. + */ + if (fctx->pending == 0 && fctx->nqueries == 0 && + ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) { + /* + * This fctx is already shutdown; we were just + * waiting for the last reference to go away. + */ + bucket_empty = fctx_destroy(fctx); + } else { + /* + * Initiate shutdown. + */ + fctx_shutdown(fctx); + } } return (bucket_empty); } diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 4cc1fe8ab8f..dc3cffb9a4f 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: grammar.h,v 1.19.136.1 2010/06/22 04:02:45 marka Exp $ */ +/* $Id: grammar.h,v 1.19.136.2 2010/06/23 23:46:36 tbox Exp $ */ #ifndef ISCCFG_GRAMMAR_H #define ISCCFG_GRAMMAR_H 1 diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 58b53ee65ec..a0f4c94deef 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: parser.c,v 1.132.104.1 2010/06/22 04:02:45 marka Exp $ */ +/* $Id: parser.c,v 1.132.104.2 2010/06/23 23:46:36 tbox Exp $ */ /*! \file */ diff --git a/util/kit.sh b/util/kit.sh index d6ec8cec0d2..138c1d26c73 100644 --- a/util/kit.sh +++ b/util/kit.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007-2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: kit.sh,v 1.40.48.2 2010/06/22 06:15:11 marka Exp $ +# $Id: kit.sh,v 1.40.48.3 2010/06/23 23:46:36 tbox Exp $ # Make a release kit #