From ddf3b86e0be0a99f0433a88abdd38232e8b871dc Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Mon, 23 Jul 2012 21:15:37 +0000 Subject: [PATCH 1/6] update SRCID --- doc/private/SRCID | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/private/SRCID b/doc/private/SRCID index 54ed9518d3..033415a957 100644 --- a/doc/private/SRCID +++ b/doc/private/SRCID @@ -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/23 21:15:00 UTC )" From a8ac2df24044f27ff359d854a2785ac533849a44 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Mon, 23 Jul 2012 23:30:02 +0000 Subject: [PATCH 2/6] newcopyrights --- util/copyrights | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/copyrights b/util/copyrights index 9a3a9f811b..c19c815862 100644 --- a/util/copyrights +++ b/util/copyrights @@ -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 From f69f6d9d650fc5c35ae330aa6d1334111f604130 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Mon, 23 Jul 2012 23:45:13 +0000 Subject: [PATCH 3/6] update copyright notice --- lib/dns/dst_result.c | 2 +- lib/dns/include/dst/result.h | 2 +- lib/dns/openssl_link.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c index d5ee38d169..297e809cc9 100644 --- a/lib/dns/dst_result.c +++ b/lib/dns/dst_result.c @@ -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 diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h index 9b6389d11d..00640a1b1c 100644 --- a/lib/dns/include/dst/result.h +++ b/lib/dns/include/dst/result.h @@ -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 diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 9ac78f2e64..75d8f95e53 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -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 From 70fcea59c59d0bc9e680426d8f254af3300c4ec5 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 24 Jul 2012 00:15:45 +0000 Subject: [PATCH 4/6] update SRCID --- doc/private/SRCID | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/private/SRCID b/doc/private/SRCID index 033415a957..a47d6c21a0 100644 --- a/doc/private/SRCID +++ b/doc/private/SRCID @@ -1,4 +1,4 @@ # This file must follow /bin/sh rules. It is imported directly via # configure. # -SRCID="( 2012/07/23 21:15:00 UTC )" +SRCID="( 2012/07/24 00:15:00 UTC )" From d72d9d58585f75bf72823ae75ecd2c477f5b5519 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 24 Jul 2012 12:26:54 +1000 Subject: [PATCH 5/6] cleanup unused variables --- lib/dns/opensslrsa_link.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index d9501fd28f..fb35ce8813 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -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; From bbe6cf8aedbb557020d999fbfe051105d1940850 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 24 Jul 2012 03:16:04 +0000 Subject: [PATCH 6/6] update SRCID --- doc/private/SRCID | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/private/SRCID b/doc/private/SRCID index a47d6c21a0..e5df8382f0 100644 --- a/doc/private/SRCID +++ b/doc/private/SRCID @@ -1,4 +1,4 @@ # This file must follow /bin/sh rules. It is imported directly via # configure. # -SRCID="( 2012/07/24 00:15:00 UTC )" +SRCID="( 2012/07/24 03:15:00 UTC )"