diff --git a/bin/tests/system/checkconf/dnssec.1 b/bin/tests/system/checkconf/dnssec.1 index f45c127e51..43760d199d 100644 --- a/bin/tests/system/checkconf/dnssec.1 +++ b/bin/tests/system/checkconf/dnssec.1 @@ -1,3 +1,17 @@ +.\" Copyright (C) 2011 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 +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +.\" PERFORMANCE OF THIS SOFTWARE. +.\" /* * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") * @@ -14,7 +28,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec.1,v 1.1.4.2 2011/05/07 05:52:58 each Exp $ */ +/* $Id: dnssec.1,v 1.1.4.3 2011/05/07 23:46:35 tbox Exp $ */ options { dnssec-validation yes; diff --git a/bin/tests/system/checkconf/dnssec.2 b/bin/tests/system/checkconf/dnssec.2 index 3078f8e333..3b74cac92c 100644 --- a/bin/tests/system/checkconf/dnssec.2 +++ b/bin/tests/system/checkconf/dnssec.2 @@ -1,3 +1,17 @@ +.\" Copyright (C) 2011 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 +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +.\" PERFORMANCE OF THIS SOFTWARE. +.\" /* * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") * @@ -14,7 +28,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec.2,v 1.1.4.2 2011/05/07 05:52:58 each Exp $ */ +/* $Id: dnssec.2,v 1.1.4.3 2011/05/07 23:46:35 tbox Exp $ */ options { dnssec-validation yes; diff --git a/bin/tests/system/checkconf/dnssec.3 b/bin/tests/system/checkconf/dnssec.3 index 606a4386d2..18d90ca8e6 100644 --- a/bin/tests/system/checkconf/dnssec.3 +++ b/bin/tests/system/checkconf/dnssec.3 @@ -1,3 +1,17 @@ +.\" Copyright (C) 2011 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 +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +.\" PERFORMANCE OF THIS SOFTWARE. +.\" /* * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") * @@ -14,7 +28,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec.3,v 1.1.4.2 2011/05/07 05:52:58 each Exp $ */ +/* $Id: dnssec.3,v 1.1.4.3 2011/05/07 23:46:35 tbox Exp $ */ options { dnssec-validation yes; diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index 1000e005b0..ce80dea27f 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2005, 2007, 2010, 2011 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 @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: good.conf,v 1.4.558.3 2011/05/07 05:52:58 each Exp $ */ +/* $Id: good.conf,v 1.4.558.4 2011/05/07 23:46:35 tbox Exp $ */ /* * This is just a random selection of configuration options. diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index b88a7150ab..63818b343d 100644 --- a/bin/tests/system/checkconf/tests.sh +++ b/bin/tests/system/checkconf/tests.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2005, 2007, 2010, 2011 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 @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.3.558.3 2011/05/07 05:52:58 each Exp $ +# $Id: tests.sh,v 1.3.558.4 2011/05/07 23:46:35 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 4fd0ae287d..1fbdb2dde4 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.c,v 1.114.4.10 2011/05/07 05:52:58 each Exp $ */ +/* $Id: check.c,v 1.114.4.11 2011/05/07 23:46:36 tbox Exp $ */ /*! \file */ @@ -1912,7 +1912,7 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, const cfg_obj_t *obj; isc_boolean_t enablednssec, enablevalidation; - /* + /* * Get global options block */ (void)cfg_map_get(config, "options", &options);