Skip to content

GitLab

Commit d7201de0 authored by Automatic Updater's avatar Automatic Updater
Browse files
Options

update copyright notice

parent e7c38ca9
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 291 deletions
bin/check/Makefile.in
View file @ d7201de0
# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2003 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.34 2009/09/01 18:40:25 jinmei Exp $
# $Id: Makefile.in,v 1.35 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......
bin/dig/Makefile.in
View file @ d7201de0
# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 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.43 2009/09/01 18:40:25 jinmei Exp $
# $Id: Makefile.in,v 1.44 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......
bin/dnssec/dnssec-keygen.c
View file @ d7201de0
......@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keygen.c,v 1.91 2009/09/02 06:29:00 each Exp $ */
/* $Id: dnssec-keygen.c,v 1.92 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......@@ -311,63 +311,63 @@ main(int argc, char **argv) {
/* already the default */
break;
case 'P':
if (setpub || unsetpub)
fatal("-P specified more than once");
if (setpub || unsetpub)
fatal("-P specified more than once");
if (strcasecmp(isc_commandline_argument, "none")) {
setpub = ISC_TRUE;
publish = strtotime(isc_commandline_argument,
now, now);
} else {
unsetpub = ISC_TRUE;
}
unsetpub = ISC_TRUE;
}
break;
case 'A':
if (setact || unsetact)
fatal("-A specified more than once");
if (setact || unsetact)
fatal("-A specified more than once");
if (strcasecmp(isc_commandline_argument, "none")) {
setact = ISC_TRUE;
activate = strtotime(isc_commandline_argument,
now, now);
} else {
unsetact = ISC_TRUE;
unsetact = ISC_TRUE;
}
break;
case 'R':
if (setrev || unsetrev)
fatal("-R specified more than once");
if (setrev || unsetrev)
fatal("-R specified more than once");
if (strcasecmp(isc_commandline_argument, "none")) {
setrev = ISC_TRUE;
revoke = strtotime(isc_commandline_argument,
now, now);
} else {
unsetrev = ISC_TRUE;
unsetrev = ISC_TRUE;
}
break;
case 'U':
if (setunpub || unsetunpub)
fatal("-U specified more than once");
if (setunpub || unsetunpub)
fatal("-U specified more than once");
if (strcasecmp(isc_commandline_argument, "none")) {
setunpub = ISC_TRUE;
unpublish = strtotime(isc_commandline_argument,
now, now);
} else {
unsetunpub = ISC_TRUE;
unsetunpub = ISC_TRUE;
}
break;
case 'D':
if (setdel || unsetdel)
fatal("-D specified more than once");
if (setdel || unsetdel)
fatal("-D specified more than once");
if (strcasecmp(isc_commandline_argument, "none")) {
setdel = ISC_TRUE;
delete = strtotime(isc_commandline_argument,
now, now);
} else {
unsetdel = ISC_TRUE;
unsetdel = ISC_TRUE;
}
break;
case 'F':
......@@ -691,7 +691,7 @@ main(int argc, char **argv) {
fatal("cannot use -C together with "
"-P, -A, -R, -U, or -D options");
/*
* Compatibility mode: Private-key-format
* Compatibility mode: Private-key-format
* should be set to 1.2.
*/
dst_key_setprivateformat(key, 1, 2);
......
bin/dnssec/dnssec-revoke.c
View file @ d7201de0
......@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-revoke.c,v 1.9 2009/09/02 06:29:00 each Exp $ */
/* $Id: dnssec-revoke.c,v 1.10 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......@@ -161,9 +161,9 @@ main(int argc, char **argv) {
flags = dst_key_flags(key);
if ((flags & DNS_KEYFLAG_REVOKE) == 0) {
isc_stdtime_t now;
isc_stdtime_t now;
isc_stdtime_get(&now);
isc_stdtime_get(&now);
dst_key_settime(key, DST_TIME_REVOKE, now);
dst_key_setflags(key, flags | DNS_KEYFLAG_REVOKE);
......
bin/dnssec/dnssec-settime.c
View file @ d7201de0
......@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-settime.c,v 1.9 2009/09/02 06:29:00 each Exp $ */
/* $Id: dnssec-settime.c,v 1.10 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......@@ -72,7 +72,7 @@ usage(void) {
"deletion date\n");
fprintf(stderr, "Printing options:\n");
fprintf(stderr, " -p C/P/A/R/U/D/all: print a particular time "
"value or values "
"value or values "
"[default: all]\n");
fprintf(stderr, " -u: print times in unix epoch "
"format\n");
......@@ -213,8 +213,8 @@ main(int argc, char **argv) {
fatal("-v must be followed by a number");
break;
case 'P':
if (setpub || unsetpub)
fatal("-P specified more than once");
if (setpub || unsetpub)
fatal("-P specified more than once");
changed = ISC_TRUE;
if (!strcasecmp(isc_commandline_argument, "none")) {
......@@ -226,8 +226,8 @@ main(int argc, char **argv) {
}
break;
case 'A':
if (setact || unsetact)
fatal("-A specified more than once");
if (setact || unsetact)
fatal("-A specified more than once");
changed = ISC_TRUE;
if (!strcasecmp(isc_commandline_argument, "none")) {
......@@ -239,8 +239,8 @@ main(int argc, char **argv) {
}
break;
case 'R':
if (setrev || unsetrev)
fatal("-R specified more than once");
if (setrev || unsetrev)
fatal("-R specified more than once");
changed = ISC_TRUE;
if (!strcasecmp(isc_commandline_argument, "none")) {
......@@ -252,8 +252,8 @@ main(int argc, char **argv) {
}
break;
case 'U':
if (setunpub || unsetunpub)
fatal("-U specified more than once");
if (setunpub || unsetunpub)
fatal("-U specified more than once");
changed = ISC_TRUE;
if (!strcasecmp(isc_commandline_argument, "none")) {
......@@ -265,8 +265,8 @@ main(int argc, char **argv) {
}
break;
case 'D':
if (setdel || unsetdel)
fatal("-D specified more than once");
if (setdel || unsetdel)
fatal("-D specified more than once");
changed = ISC_TRUE;
if (!strcasecmp(isc_commandline_argument, "none")) {
......@@ -360,20 +360,20 @@ main(int argc, char **argv) {
dst_key_unsettime(key, DST_TIME_ACTIVATE);
if (setrev) {
if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0 && rev > now)
fprintf(stderr, "%s: warning: Key %s is already "
if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0 && rev > now)
fprintf(stderr, "%s: warning: Key %s is already "
"revoked; changing the revocation date "
"will not affect this.\n",
program, keystr);
dst_key_settime(key, DST_TIME_REVOKE, rev);
} else if (unsetrev) {
if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0)
fprintf(stderr, "%s: warning: Key %s is already "
if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0)
fprintf(stderr, "%s: warning: Key %s is already "
"revoked; removing the revocation date "
"will not affect this.\n",
program, keystr);
dst_key_unsettime(key, DST_TIME_REVOKE);
}
}
if (setunpub)
dst_key_settime(key, DST_TIME_UNPUBLISH, unpub);
......
bin/dnssec/dnssectool.c
View file @ d7201de0
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssectool.c,v 1.51 2009/09/02 06:29:01 each Exp $ */
/* $Id: dnssectool.c,v 1.52 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......@@ -304,8 +304,8 @@ strtottl(const char *str) {
char *endp;
ttl = strtol(str, &endp, 0);
if (ttl == 0 && endp == str)
fatal("TTL must be numeric");
if (ttl == 0 && endp == str)
fatal("TTL must be numeric");
ttl = time_units(ttl, endp, orig);
return (ttl);
}
......
bin/dnssec/dnssectool.h
View file @ d7201de0
/*
* Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001, 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: dnssectool.h,v 1.23 2009/09/02 06:29:01 each Exp $ */
/* $Id: dnssectool.h,v 1.24 2009/09/02 23:48:01 tbox Exp $ */
#ifndef DNSSECTOOL_H
#define DNSSECTOOL_H 1
......
bin/named/lwdgabn.c
View file @ d7201de0
/*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 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: lwdgabn.c,v 1.23 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: lwdgabn.c,v 1.24 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......
bin/named/lwdgrbn.c
View file @ d7201de0
/*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001, 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: lwdgrbn.c,v 1.21 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: lwdgrbn.c,v 1.22 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......
bin/named/lwresd.c
View file @ d7201de0
/*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2009 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: lwresd.c,v 1.59 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: lwresd.c,v 1.60 2009/09/02 23:48:01 tbox Exp $ */
/*! \file
* \brief
......
bin/named/tkeyconf.c
View file @ d7201de0
/*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-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: tkeyconf.c,v 1.30 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: tkeyconf.c,v 1.31 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......
bin/named/unix/Makefile.in
View file @ d7201de0
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-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.11 2009/09/01 00:22:25 jinmei Exp $
# $Id: Makefile.in,v 1.12 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......
bin/tests/adb_test.c
View file @ d7201de0
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-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: adb_test.c,v 1.69 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: adb_test.c,v 1.70 2009/09/02 23:48:01 tbox Exp $ */
/*! \file */
......
bin/tests/backtrace_test.c
View file @ d7201de0
......@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: backtrace_test.c,v 1.3 2009/09/01 20:13:43 each Exp $ */
/* $Id: backtrace_test.c,v 1.4 2009/09/02 23:48:01 tbox Exp $ */
#include <config.h>
......@@ -46,10 +46,10 @@ func3() {
isc_result_totext(result));
return (1);
}
if (nframes < 4)
error++;
for (i = 0; i < 4 && i < nframes; i++) {
fname = NULL;
result = isc_backtrace_getsymbol(tracebuf[i], &fname, &offset);
......
bin/tests/byname_test.c
View file @ d7201de0
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 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: byname_test.c,v 1.32 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: byname_test.c,v 1.33 2009/09/02 23:48:01 tbox Exp $ */
/*! \file
* \author
......
bin/tests/db/Makefile.in
View file @ d7201de0
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-2002 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.30 2009/09/01 00:22:25 jinmei Exp $
# $Id: Makefile.in,v 1.31 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......
bin/tests/db_test.c
View file @ d7201de0
/*
* Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-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: db_test.c,v 1.67 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: db_test.c,v 1.68 2009/09/02 23:48:01 tbox Exp $ */
/*! \file
* \author
......
bin/tests/dst/gsstest.c
View file @ d7201de0
/*
* Copyright (C) 2006, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2006, 2007, 2009 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: gsstest.c,v 1.7 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: gsstest.c,v 1.8 2009/09/02 23:48:01 tbox Exp $ */
#include <config.h>
......@@ -175,7 +175,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
end:
if (query)
dns_message_destroy(&query);
if (reqev->request)
dns_request_destroy(&reqev->request);
......@@ -184,7 +184,7 @@ end:
event = isc_event_allocate(mctx, (void *)1, 1, console, NULL,
sizeof(*event));
isc_task_send(task, &event);
return;
return;
}
......@@ -202,7 +202,7 @@ sendquery(isc_task_t *task, isc_event_t *event)
char output[10 * 1024];
static char host[256];
isc_event_free(&event);
printf("Query => ");
......@@ -335,7 +335,7 @@ end:
dns_request_destroy(&reqev->request);
isc_event_free(&event);
event = isc_event_allocate(mctx, (void *)1, 1, console, NULL,
sizeof(*event));
isc_task_send(task, &event);
......@@ -357,14 +357,14 @@ initctx1(isc_task_t *task, isc_event_t *event) {
sprintf(contextname, "gsstest.context.%d.", (int)time(NULL));
printf("Initctx - context name we're using: %s\n", contextname);
printf("Negotiating GSSAPI context: ");
printf(gssid);
printf("\n");
/*
* Setup a GSSAPI context with the server
*/
*/
dns_fixedname_init(&servername);
isc_buffer_init(&buf, contextname, strlen(contextname));
isc_buffer_add(&buf, strlen(contextname));
......@@ -372,7 +372,7 @@ initctx1(isc_task_t *task, isc_event_t *event) {
dns_rootname, 0, NULL);
CHECK("dns_name_fromtext", result);
/* Make name happen */
/* Make name happen */
dns_fixedname_init(&gssname);
isc_buffer_init(&buf, gssid, strlen(gssid));
isc_buffer_add(&buf, strlen(gssid));
......@@ -423,7 +423,7 @@ setup(void)
isc_sockaddr_fromin(&address, &inaddr, PORT);
return;
}
};
}
......@@ -446,7 +446,7 @@ main(int argc, char *argv[]) {
UNUSED(argv);
UNUSED(argc);
RUNCHECK(isc_app_start());
dns_result_register();
......@@ -519,7 +519,7 @@ main(int argc, char *argv[]) {
&sock));
setup();
RUNCHECK(isc_app_onrun(mctx, task, console, NULL));
(void)isc_app_run();
......@@ -529,10 +529,10 @@ main(int argc, char *argv[]) {
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
dns_dispatch_detach(&dispatchv4);
dns_dispatchmgr_destroy(&dispatchmgr);
isc_timermgr_destroy(&timermgr);
isc_task_detach(&task);
......
bin/tests/master/Makefile.in
View file @ d7201de0
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-2002 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.29 2009/09/01 00:22:25 jinmei Exp $
# $Id: Makefile.in,v 1.30 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......
bin/tests/master_test.c
View file @ d7201de0
/*
* Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-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: master_test.c,v 1.31 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: master_test.c,v 1.32 2009/09/02 23:48:01 tbox Exp $ */
#include <config.h>
......@@ -85,7 +85,7 @@ main(int argc, char *argv[]) {
dns_rdatacallbacks_init_stdio(&callbacks);
callbacks.add = print_dataset;
result = dns_master_loadfile(argv[1], &origin, &origin,
result = dns_master_loadfile(argv[1], &origin, &origin,
dns_rdataclass_in, 0,
&callbacks, mctx);
fprintf(stdout, "dns_master_loadfile: %s\n",
......
bin/tests/mem/Makefile.in
View file @ d7201de0
# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2002 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.35 2009/09/01 00:22:25 jinmei Exp $
# $Id: Makefile.in,v 1.36 2009/09/02 23:48:01 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......