ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'v9_6' of ssh://repo/proj/git/prod/bind9 into v9_6

Browse Source
This commit is contained in:
Evan Hunt
2012-07-23 23:31:14 -07:00
parent 8181ca0d97 bbe6cf8aed
commit 779ec9984d
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/private/SRCID
View File

@@ -1,4 +1,4 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
SRCID="( 2012/07/23 20:15:00 UTC )"
SRCID="( 2012/07/24 03:15:00 UTC )"

2
lib/dns/dst_result.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/dns/include/dst/result.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/dns/openssl_link.c
View File

@@ -1,5 +1,5 @@
/*
* Poetions Copyright (C) 2004-2012 Internet Systems Consortnum, Inc. ("ISC")
* Portions Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

3
lib/dns/opensslrsa_link.c
View File

@@ -375,9 +375,6 @@ opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
int status = 0;
int type = 0;
unsigned int digestlen = 0;
unsigned long err;
const char* file;
int line;
#if OPENSSL_VERSION_NUMBER < 0x00908000L
unsigned int prefixlen = 0;
const unsigned char *prefix = NULL;

4
util/copyrights
View File

@@ -1722,7 +1722,7 @@
./lib/dns/dst_openssl.h C 2002,2004,2005,2007,2008,2011,2012
./lib/dns/dst_parse.c C.NAI 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/dst_parse.h C.NAI 2000,2001,2002,2004,2005,2006,2007,2008,2012
./lib/dns/dst_result.c C 1999,2000,2001,2004,2005,2007,2008
./lib/dns/dst_result.c C 1999,2000,2001,2004,2005,2007,2008,2012
./lib/dns/forward.c C 2000,2001,2004,2005,2007,2012
./lib/dns/gen-unix.h C 1999,2000,2001,2004,2005,2007,2009,2012
./lib/dns/gen-win32.h C 1999,2000,2001,2004,2005,2006,2007,2009,2012
@@ -1809,7 +1809,7 @@
./lib/dns/include/dst/dst.h C 2000,2001,2002,2004,2005,2006,2007,2008,2010,2012
./lib/dns/include/dst/gssapi.h C 2000,2001,2004,2005,2006,2007,2009,2012
./lib/dns/include/dst/lib.h C 1999,2000,2001,2004,2005,2006,2007
./lib/dns/include/dst/result.h C 1999,2000,2001,2004,2005,2006,2007,2008
./lib/dns/include/dst/result.h C 1999,2000,2001,2004,2005,2006,2007,2008,2012
./lib/dns/iptable.c C 2007,2008,2009,2012
./lib/dns/journal.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2012
./lib/dns/key.c C 2001,2004,2005,2006,2007,2012