From: Automatic Updater Date: Thu, 3 Nov 2011 23:46:26 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.9.0b2~83 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0b85ae70e9e7143ca4367fe06ead34b67282878f;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/named/server.c b/bin/named/server.c index c3bbd05cc8d..79169b85f70 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.627 2011/11/03 23:05:30 each Exp $ */ +/* $Id: server.c,v 1.628 2011/11/03 23:46:26 tbox Exp $ */ /*! \file */ @@ -6149,7 +6149,7 @@ ns_server_togglequerylog(ns_server_t *server, char *args) { value = ISC_TRUE; else if (strcasecmp(ptr, "no") == 0 || strcasecmp(ptr, "off") == 0) value = ISC_FALSE; - else + else return (ISC_R_NOTFOUND); if (server->log_queries == value) diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh index 57ef9567544..732557ea728 100644 --- a/bin/tests/system/tkey/clean.sh +++ b/bin/tests/system/tkey/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 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: clean.sh,v 1.7 2011/11/03 22:06:21 each Exp $ +# $Id: clean.sh,v 1.8 2011/11/03 23:46:26 tbox Exp $ rm -f dig.out.* random.data ns1/named.conf rm -f K* ns1/K* diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index 5452b826d2e..7f235200dc2 100644 --- a/bin/tests/system/tkey/ns1/named.conf.in +++ b/bin/tests/system/tkey/ns1/named.conf.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf.in,v 1.9 2011/11/03 22:06:21 each Exp $ */ +/* $Id: named.conf.in,v 1.10 2011/11/03 23:46:26 tbox Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh index c9d98c41c6d..c445aa90c88 100644 --- a/bin/tests/system/tkey/tests.sh +++ b/bin/tests/system/tkey/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 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: tests.sh,v 1.10 2011/11/03 22:06:21 each Exp $ +# $Id: tests.sh,v 1.11 2011/11/03 23:46:26 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh