mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

update copyright notice

Browse Source
This commit is contained in:
Automatic Updater 2011-01-11 23:47:14 +00:00
parent b13d89bd89
commit 135bcc2e42
28 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/named/client.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: client.c,v 1.270 2011/01/10 05:32:03 marka Exp $ */ /* $Id: client.c,v 1.271 2011/01/11 23:47:12 tbox Exp $ */
#include <config.h> #include <config.h>

4
bin/named/server.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: server.c,v 1.596 2011/01/10 05:32:03 marka Exp $ */ /* $Id: server.c,v 1.597 2011/01/11 23:47:12 tbox Exp $ */
/*! \file */ /*! \file */
@ -2212,7 +2212,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
dns_view_setdynamickeyring(view, ring); dns_view_setdynamickeyring(view, ring);
dns_tsigkeyring_detach(&ring); dns_tsigkeyring_detach(&ring);
dns_view_detach(&pview); dns_view_detach(&pview);
} else } else
dns_view_restorekeyring(view); dns_view_restorekeyring(view);
/* /*

4
bin/named/tsigconf.c
View File

@ -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) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: tsigconf.c,v 1.34 2011/01/10 05:32:03 marka Exp $ */ /* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
/*! \file */ /*! \file */

4
bin/tests/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2003 Internet Software Consortium. # Copyright (C) 1998-2003 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # 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 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.143 2011/01/11 21:36:22 mgraff Exp $ # $Id: Makefile.in,v 1.144 2011/01/11 23:47:12 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

7
bin/tests/atomic/Makefile.in
View File

@ -1,7 +1,6 @@
# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-2002 Internet Software Consortium.
# #
# Permission to use, copy, modify, and distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies. # copyright notice and this permission notice appear in all copies.
# #
@ -13,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.1 2011/01/11 21:40:35 mgraff Exp $ # $Id: Makefile.in,v 1.2 2011/01/11 23:47:12 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

22
bin/tests/atomic/t_atomic.c
View File

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: t_atomic.c,v 1.1 2011/01/11 21:36:22 mgraff Exp $ */ /* $Id: t_atomic.c,v 1.2 2011/01/11 23:47:12 tbox Exp $ */
#include <config.h> #include <config.h>
@ -76,7 +76,7 @@ void
do_xadd(isc_task_t *task, isc_event_t *ev) { do_xadd(isc_task_t *task, isc_event_t *ev) {
counter_t *state = (counter_t *)ev->ev_arg; counter_t *state = (counter_t *)ev->ev_arg;
int i; int i;
for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) { for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
isc_atomic_xadd(&counter_32, 1); isc_atomic_xadd(&counter_32, 1);
} }
@ -100,10 +100,10 @@ test_atomic_xadd() {
"ensure that isc_atomic_xadd() works."); "ensure that isc_atomic_xadd() works.");
setup(); setup();
memset(counters, 0, sizeof(counters)); memset(counters, 0, sizeof(counters));
counter_32 = 0; counter_32 = 0;
/* /*
* Create our tasks, and allocate an event to get the counters going. * Create our tasks, and allocate an event to get the counters going.
*/ */
@ -111,7 +111,7 @@ test_atomic_xadd() {
tasks[i] = NULL; tasks[i] = NULL;
CHECK(isc_task_create(task_manager, 0, &tasks[i])); CHECK(isc_task_create(task_manager, 0, &tasks[i]));
event = isc_event_allocate(mctx, NULL, 1000, do_xadd, event = isc_event_allocate(mctx, NULL, 1000, do_xadd,
&counters[i], sizeof(struct isc_event)); &counters[i], sizeof(struct isc_event));
isc_task_sendanddetach(&tasks[i], &event); isc_task_sendanddetach(&tasks[i], &event);
} }
@ -122,7 +122,7 @@ test_atomic_xadd() {
if (counter_32 != EXPECTED_COUNT_32) if (counter_32 != EXPECTED_COUNT_32)
test_result = T_FAIL; test_result = T_FAIL;
t_result(test_result); t_result(test_result);
counter_32 = 0; counter_32 = 0;
} }
#endif #endif
@ -136,7 +136,7 @@ void
do_xaddq(isc_task_t *task, isc_event_t *ev) { do_xaddq(isc_task_t *task, isc_event_t *ev) {
counter_t *state = (counter_t *)ev->ev_arg; counter_t *state = (counter_t *)ev->ev_arg;
int i; int i;
for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) { for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
isc_atomic_xaddq(&counter_64, INCREMENT_64); isc_atomic_xaddq(&counter_64, INCREMENT_64);
} }
@ -160,10 +160,10 @@ test_atomic_xaddq() {
"ensure that isc_atomic_xaddq() works."); "ensure that isc_atomic_xaddq() works.");
setup(); setup();
memset(counters, 0, sizeof(counters)); memset(counters, 0, sizeof(counters));
counter_64 = 0; counter_64 = 0;
/* /*
* Create our tasks, and allocate an event to get the counters going. * Create our tasks, and allocate an event to get the counters going.
*/ */
@ -171,7 +171,7 @@ test_atomic_xaddq() {
tasks[i] = NULL; tasks[i] = NULL;
CHECK(isc_task_create(task_manager, 0, &tasks[i])); CHECK(isc_task_create(task_manager, 0, &tasks[i]));
event = isc_event_allocate(mctx, NULL, 1000, do_xaddq, event = isc_event_allocate(mctx, NULL, 1000, do_xaddq,
&counters[i], sizeof(struct isc_event)); &counters[i], sizeof(struct isc_event));
isc_task_sendanddetach(&tasks[i], &event); isc_task_sendanddetach(&tasks[i], &event);
} }
@ -183,7 +183,7 @@ test_atomic_xaddq() {
if (counter_64 != EXPECTED_COUNT_64) if (counter_64 != EXPECTED_COUNT_64)
test_result = T_FAIL; test_result = T_FAIL;
t_result(test_result); t_result(test_result);
counter_64 = 0; counter_64 = 0;
} }
#endif #endif

4
bin/tests/system/staticstub/tests.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.4 2011/01/10 05:08:49 marka Exp $ # $Id: tests.sh,v 1.5 2011/01/11 23:47:12 tbox Exp $
SYSTEMTESTTOP=.. SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh . $SYSTEMTESTTOP/conf.sh

4
bin/tests/system/tkey/keycreate.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001 Internet Software Consortium. * Copyright (C) 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: keycreate.c,v 1.19 2011/01/10 13:09:49 marka Exp $ */ /* $Id: keycreate.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
#include <config.h> #include <config.h>

4
bin/tests/system/tkey/keydelete.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001 Internet Software Consortium. * Copyright (C) 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: keydelete.c,v 1.17 2011/01/10 13:09:49 marka Exp $ */ /* $Id: keydelete.c,v 1.18 2011/01/11 23:47:13 tbox Exp $ */
#include <config.h> #include <config.h>

4
configure.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2003 Internet Software Consortium. # Copyright (C) 1998-2003 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.510 $) AC_REVISION($Revision: 1.511 $)
AC_INIT(lib/dns/name.c) AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59) AC_PREREQ(2.59)

12
lib/dns/dst_api.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium. * Portions Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.56 2011/01/10 05:32:03 marka Exp $ * $Id: dst_api.c,v 1.57 2011/01/11 23:47:13 tbox Exp $
*/ */
/*! \file */ /*! \file */
@ -1201,11 +1201,11 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
isc_result_t result; isc_result_t result;
dst_key_t *key; dst_key_t *key;
REQUIRE(dst_initialized == ISC_TRUE); REQUIRE(dst_initialized == ISC_TRUE);
REQUIRE(keyp != NULL && *keyp == NULL); REQUIRE(keyp != NULL && *keyp == NULL);
if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL) if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
if (dst_t_func[alg]->restore == NULL) if (dst_t_func[alg]->restore == NULL)
return (ISC_R_NOTIMPLEMENTED); return (ISC_R_NOTIMPLEMENTED);

4
lib/dns/dst_internal.h
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2000-2002 Internet Software Consortium. * Portions Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst_internal.h,v 1.28 2011/01/10 05:32:03 marka Exp $ */ /* $Id: dst_internal.h,v 1.29 2011/01/11 23:47:13 tbox Exp $ */
#ifndef DST_DST_INTERNAL_H #ifndef DST_DST_INTERNAL_H
#define DST_DST_INTERNAL_H 1 #define DST_DST_INTERNAL_H 1

4
lib/dns/gssapi_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: gssapi_link.c,v 1.15 2011/01/10 05:32:03 marka Exp $ * $Id: gssapi_link.c,v 1.16 2011/01/11 23:47:13 tbox Exp $
*/ */
#include <config.h> #include <config.h>

4
lib/dns/hmac_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: hmac_link.c,v 1.18 2011/01/10 05:32:03 marka Exp $ * $Id: hmac_link.c,v 1.19 2011/01/11 23:47:13 tbox Exp $
*/ */
#include <config.h> #include <config.h>

4
lib/dns/include/dns/result.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: result.h,v 1.121 2011/01/10 05:32:03 marka Exp $ */ /* $Id: result.h,v 1.122 2011/01/11 23:47:13 tbox Exp $ */
#ifndef DNS_RESULT_H #ifndef DNS_RESULT_H
#define DNS_RESULT_H 1 #define DNS_RESULT_H 1

4
lib/dns/include/dns/tsig.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: tsig.h,v 1.58 2011/01/10 05:32:04 marka Exp $ */ /* $Id: tsig.h,v 1.59 2011/01/11 23:47:13 tbox Exp $ */
#ifndef DNS_TSIG_H #ifndef DNS_TSIG_H
#define DNS_TSIG_H 1 #define DNS_TSIG_H 1

4
lib/dns/include/dns/view.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: view.h,v 1.130 2011/01/10 05:32:04 marka Exp $ */ /* $Id: view.h,v 1.131 2011/01/11 23:47:13 tbox Exp $ */
#ifndef DNS_VIEW_H #ifndef DNS_VIEW_H
#define DNS_VIEW_H 1 #define DNS_VIEW_H 1

8
lib/dns/include/dst/dst.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst.h,v 1.30 2011/01/10 05:32:04 marka Exp $ */ /* $Id: dst.h,v 1.31 2011/01/11 23:47:14 tbox Exp $ */
#ifndef DST_DST_H #ifndef DST_DST_H
#define DST_DST_H 1 #define DST_DST_H 1
@ -868,8 +868,8 @@ dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length);
isc_result_t isc_result_t
dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
unsigned int protocol, dns_rdataclass_t rdclass, unsigned int protocol, dns_rdataclass_t rdclass,
isc_mem_t *mctx, const char *keystr, dst_key_t **keyp); isc_mem_t *mctx, const char *keystr, dst_key_t **keyp);
ISC_LANG_ENDDECLS ISC_LANG_ENDDECLS

4
lib/dns/openssldh_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: openssldh_link.c,v 1.19 2011/01/10 05:32:03 marka Exp $ * $Id: openssldh_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $
*/ */
#ifdef OPENSSL #ifdef OPENSSL

4
lib/dns/openssldsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: openssldsa_link.c,v 1.19 2011/01/10 05:32:03 marka Exp $ */ /* $Id: openssldsa_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
#ifdef OPENSSL #ifdef OPENSSL
#ifndef USE_EVP #ifndef USE_EVP

4
lib/dns/opensslrsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium. * Copyright (C) 2000-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -17,7 +17,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: opensslrsa_link.c,v 1.38 2011/01/10 05:32:03 marka Exp $ * $Id: opensslrsa_link.c,v 1.39 2011/01/11 23:47:13 tbox Exp $
*/ */
#ifdef OPENSSL #ifdef OPENSSL
#include <config.h> #include <config.h>

4
lib/dns/result.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: result.c,v 1.131 2011/01/10 05:32:03 marka Exp $ */ /* $Id: result.c,v 1.132 2011/01/11 23:47:13 tbox Exp $ */
/*! \file */ /*! \file */

4
lib/dns/spnego.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2006-2011 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: spnego.c,v 1.15 2011/01/10 05:32:03 marka Exp $ */ /* $Id: spnego.c,v 1.16 2011/01/11 23:47:13 tbox Exp $ */
/*! \file /*! \file
* \brief * \brief

12
lib/dns/tsig.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: tsig.c,v 1.146 2011/01/10 07:38:22 marka Exp $ * $Id: tsig.c,v 1.147 2011/01/11 23:47:13 tbox Exp $
*/ */
/*! \file */ /*! \file */
#include <config.h> #include <config.h>
@ -550,7 +550,7 @@ dst_alg_fromname(dns_name_t *algorithm) {
} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) { } else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) {
return (DST_ALG_HMACSHA512); return (DST_ALG_HMACSHA512);
} else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPI_NAME)) { } else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPI_NAME)) {
return (DST_ALG_GSSAPI); return (DST_ALG_GSSAPI);
} else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPIMS_NAME)) { } else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPIMS_NAME)) {
return (DST_ALG_GSSAPI); return (DST_ALG_GSSAPI);
} else } else
@ -629,9 +629,9 @@ dump_key(dns_tsigkey_t *tkey, FILE *fp)
{ {
char *buffer = NULL; char *buffer = NULL;
int length = 0; int length = 0;
char namestr[DNS_NAME_FORMATSIZE]; char namestr[DNS_NAME_FORMATSIZE];
char creatorstr[DNS_NAME_FORMATSIZE]; char creatorstr[DNS_NAME_FORMATSIZE];
char algorithmstr[DNS_NAME_FORMATSIZE]; char algorithmstr[DNS_NAME_FORMATSIZE];
isc_result_t result; isc_result_t result;
dns_name_format(&tkey->name, namestr, sizeof(namestr)); dns_name_format(&tkey->name, namestr, sizeof(namestr));

6
lib/dns/view.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: view.c,v 1.175 2011/01/10 05:32:03 marka Exp $ */ /* $Id: view.c,v 1.176 2011/01/11 23:47:13 tbox Exp $ */
/*! \file */ /*! \file */
@ -304,7 +304,7 @@ destroy(dns_view_t *view) {
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
if (fclose(fp) == 0) if (fclose(fp) == 0)
result = isc_file_rename(template, result = isc_file_rename(template,
keyfile); keyfile);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
(void)remove(template); (void)remove(template);
} else { } else {

4
lib/isc/include/isc/file.h
View File

@ -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) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: file.h,v 1.38 2011/01/10 05:32:04 marka Exp $ */ /* $Id: file.h,v 1.39 2011/01/11 23:47:14 tbox Exp $ */
#ifndef ISC_FILE_H #ifndef ISC_FILE_H
#define ISC_FILE_H 1 #define ISC_FILE_H 1

4
lib/isc/unix/file.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -48,7 +48,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* $Id: file.c,v 1.56 2011/01/10 05:32:04 marka Exp $ */ /* $Id: file.c,v 1.57 2011/01/11 23:47:14 tbox Exp $ */
/*! \file */ /*! \file */

6
lib/isc/win32/file.c
View File

@ -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) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: file.c,v 1.36 2011/01/10 05:32:04 marka Exp $ */ /* $Id: file.c,v 1.37 2011/01/11 23:47:14 tbox Exp $ */
#include <config.h> #include <config.h>
@ -345,7 +345,7 @@ isc_file_openuniquemode(char *templet, unsigned int mode, FILE **fp) {
if (fd == -1) if (fd == -1)
result = isc__errno2result(errno); result = isc__errno2result(errno);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
#if 1 #if 1
UNUSED(mode) UNUSED(mode)
#else #else
(void)fchmod(fd, mode); (void)fchmod(fd, mode);