7173752 Problem with network/dns s11-sru
authortomas.jedlicka <tomas.jedlicka@oracle.com>
Sun, 24 Jun 2012 06:59:24 -0700
branchs11-sru
changeset 2294 957c8f463552
parent 2293 b3ed7ecee31f
child 2295 6ab181a7f415
7173752 Problem with network/dns 7154060 With 119783-21, "named" spits out: "zone serial unchanged. zone may fail to transfer to slaves.". 7174589 Upgrade BIND to 9.6-ESV-R7-P1
components/bind/Makefile
components/bind/bind.license
components/bind/bindc.p5m
components/bind/patches/rndc-keys.patch
--- a/components/bind/Makefile	Tue Jun 19 21:08:13 2012 -0700
+++ b/components/bind/Makefile	Sun Jun 24 06:59:24 2012 -0700
@@ -18,19 +18,19 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		bind
-COMPONENT_VERSION=	9.6-ESV-R5-P1
-IPS_COMPONENT_VERSION=	9.6.3.5.1
+COMPONENT_VERSION=	9.6-ESV-R7-P1
+IPS_COMPONENT_VERSION=	9.6.3.7.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	"http://www.isc.org/software/bind"
 
 # hash from: sha1sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha1:\1/'
-COMPONENT_ARCHIVE_HASH=	sha1:6d9873a66dda3ef43c1db9a1082ad428722f7d69
+COMPONENT_ARCHIVE_HASH=	sha1:a5d3024a7e9f7c6a954cfd6672a79b03ca58332a
 COMPONENT_ARCHIVE_URL=	\
 	http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
--- a/components/bind/bind.license	Tue Jun 19 21:08:13 2012 -0700
+++ b/components/bind/bind.license	Sun Jun 24 06:59:24 2012 -0700
@@ -1,4 +1,14 @@
-Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+This package may include technology which may be subject to one or more of
+the following additional notices:
+
+----------------------
+- BIND 9.6-ESV-R7-P1 -
+----------------------
+
+Oracle Internal Tracking Number TBD
+
+Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +23,7 @@
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.14.176.4 2011-02-22 06:40:42 marka Exp $
+$Id$
 
 	Portions of this code release fall under one or more of the
 	following Copyright notices.  Please see individual source
--- a/components/bind/bindc.p5m	Tue Jun 19 21:08:13 2012 -0700
+++ b/components/bind/bindc.p5m	Sun Jun 24 06:59:24 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -41,12 +41,12 @@
 dir path=usr/lib/dns
 dir path=usr/sbin
 
-file path=usr/lib/dns/libbind9.so.50.0.5
-file path=usr/lib/dns/libdns.so.58.1.5
-file path=usr/lib/dns/libisc.so.50.5.1
-file path=usr/lib/dns/libisccc.so.50.0.1
-file path=usr/lib/dns/libisccfg.so.50.0.4
-file path=usr/lib/dns/liblwres.so.50.0.4
+file path=usr/lib/dns/libbind9.so.50.0.7
+file path=usr/lib/dns/libdns.so.110.0.2
+file path=usr/lib/dns/libisc.so.57.0.2
+file path=usr/lib/dns/libisccc.so.50.0.2
+file path=usr/lib/dns/libisccfg.so.50.0.6
+file path=usr/lib/dns/liblwres.so.50.0.5
 file path=usr/sbin/dig
 file path=usr/sbin/host
 file path=usr/sbin/nslookup
@@ -54,18 +54,18 @@
 file path=usr/sbin/rndc
 file path=usr/sbin/rndc-confgen
 
-link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.5
-link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.5
-link path=usr/lib/dns/libdns.so target=libdns.so.58.1.5
-link path=usr/lib/dns/libdns.so.58 target=libdns.so.58.1.5
-link path=usr/lib/dns/libisc.so target=libisc.so.50.5.1
-link path=usr/lib/dns/libisc.so.50 target=libisc.so.50.5.1
-link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.1
-link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.1
-link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.4
-link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.4
-link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.4
-link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.4
+link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.7
+link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.7
+link path=usr/lib/dns/libdns.so target=libdns.so.110.0.2
+link path=usr/lib/dns/libdns.so.110 target=libdns.so.110.0.2
+link path=usr/lib/dns/libisc.so target=libisc.so.57.0.2
+link path=usr/lib/dns/libisc.so.57 target=libisc.so.57.0.2
+link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.2
+link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.2
+link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.6
+link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.6
+link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.5
+link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.5
 
 legacy pkg=SUNWbindc \
        name="BIND DNS tools" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bind/patches/rndc-keys.patch	Sun Jun 24 06:59:24 2012 -0700
@@ -0,0 +1,51 @@
+--- a/bin/named/controlconf.c	Fri Jun  1 10:05:49 2012
++++ b/bin/named/controlconf.c	Tue Jun  5 17:27:55 2012
[email protected]@ -371,12 +371,14 @@
+ 		secret.rend = secret.rstart + key->secret.length;
+ 		result = isccc_cc_fromwire(&ccregion, &request, &secret);
+ 		if (result == ISC_R_SUCCESS)
+ 			break;
+ 		isc_mem_put(listener->mctx, secret.rstart, REGION_SIZE(secret));
+-		log_invalid(&conn->ccmsg, result);
+-		goto cleanup;
++		if (result != ISCCC_R_BADAUTH) {
++		    log_invalid(&conn->ccmsg, result);
++		    goto cleanup;
++		}
+ 	}
+ 
+ 	if (key == NULL) {
+ 		log_invalid(&conn->ccmsg, ISCCC_R_BADAUTH);
+ 		goto cleanup;
+--- a/lib/isccc/cc.c	Wed Jun  6 01:41:54 2012
++++ b/lib/isccc/cc.c	Wed Jun  6 01:43:22 2012
[email protected]@ -397,12 +397,10 @@
+ 		if (first_tag && secret != NULL && strcmp(key, "_auth") == 0)
+ 			checksum_rstart = source->rstart;
+ 		first_tag = ISC_FALSE;
+ 	}
+ 
+-	*alistp = alist;
+-
+ 	if (secret != NULL) {
+ 		if (checksum_rstart != NULL)
+ 			result = verify(alist, checksum_rstart,
+ 					(source->rend - checksum_rstart),
+ 					secret);
+--- a/lib/isccc/cc.c	Wed Jun  6 01:45:26 2012
++++ b/lib/isccc/cc.c	Wed Jun  6 01:43:22 2012
[email protected]@ -408,11 +408,13 @@
+ 			result = ISCCC_R_BADAUTH;
+ 	} else
+ 		result = ISC_R_SUCCESS;
+ 
+  bad:
+-	if (result != ISC_R_SUCCESS)
++	if (result == ISC_R_SUCCESS)
++		*alistp = alist;
++	else
+ 		isccc_sexpr_free(&alist);
+ 
+ 	return (result);
+ }
+