From owner-p4-projects@FreeBSD.ORG Fri Jul 27 21:35:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F3716A420; Fri, 27 Jul 2007 21:35:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93A2016A418 for ; Fri, 27 Jul 2007 21:35:41 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7577413C442 for ; Fri, 27 Jul 2007 21:35:41 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6RLZfOm077197 for ; Fri, 27 Jul 2007 21:35:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6RLZajd077193 for perforce@freebsd.org; Fri, 27 Jul 2007 21:35:36 GMT (envelope-from peter@freebsd.org) Date: Fri, 27 Jul 2007 21:35:36 GMT Message-Id: <200707272135.l6RLZajd077193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 124217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2007 21:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=124217 Change 124217 by peter@peter_overcee on 2007/07/27 21:35:15 IFC @@124213 Affected files ... .. //depot/projects/hammer/contrib/bind9/CHANGES#8 integrate .. //depot/projects/hammer/contrib/bind9/README#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/hammer/contrib/bind9/version#8 integrate .. //depot/projects/hammer/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/hammer/contrib/openbsm/README#5 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/hammer/contrib/openbsm/configure#5 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_control.3#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_event.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#39 integrate .. //depot/projects/hammer/etc/rc.d/netif#20 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#9 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.c#5 integrate .. //depot/projects/hammer/lib/libc/yp/yplib.c#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#7 integrate .. //depot/projects/hammer/lib/ncurses/config.mk#3 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/hammer/sbin/Makefile#46 integrate .. //depot/projects/hammer/sbin/iscontrol/Makefile#1 branch .. //depot/projects/hammer/sbin/iscontrol/auth_subr.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/config.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/fsm.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/iscontrol.8#1 branch .. //depot/projects/hammer/sbin/iscontrol/iscontrol.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/iscontrol.h#1 branch .. //depot/projects/hammer/sbin/iscontrol/iscsi.conf.5#1 branch .. //depot/projects/hammer/sbin/iscontrol/login.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/misc.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/pdu.c#1 branch .. //depot/projects/hammer/sbin/iscontrol/pdu.h#1 branch .. //depot/projects/hammer/share/examples/kld/syscall/module/syscall.c#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#93 integrate .. //depot/projects/hammer/share/man/man4/iscsi_initiator.4#1 branch .. //depot/projects/hammer/share/man/man4/udav.4#7 integrate .. //depot/projects/hammer/share/man/man4/usb.4#12 integrate .. //depot/projects/hammer/share/man/man7/ports.7#19 integrate .. //depot/projects/hammer/share/man/man8/rc.8#11 integrate .. //depot/projects/hammer/share/man/man9/sysctl_ctx_init.9#5 integrate .. //depot/projects/hammer/share/mk/version_gen.awk#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#98 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#63 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#24 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#40 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#26 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#1 branch .. //depot/projects/hammer/sys/arm/include/armreg.h#5 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#11 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#22 integrate .. //depot/projects/hammer/sys/arm/include/pte.h#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#12 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_wdog.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321var.h#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obio.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/hammer/sys/bsm/audit.h#8 integrate .. //depot/projects/hammer/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#26 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#44 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#23 integrate .. //depot/projects/hammer/sys/conf/NOTES#124 integrate .. //depot/projects/hammer/sys/conf/files#157 integrate .. //depot/projects/hammer/sys/conf/options#112 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#12 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#14 integrate .. //depot/projects/hammer/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#25 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#27 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#35 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#67 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#53 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_cam.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_sm.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_subr.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.h#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsivar.h#1 branch .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#9 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#8 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#49 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#84 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#52 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#39 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#44 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#55 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#38 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#96 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#54 integrate .. //depot/projects/hammer/sys/kern/subr_clock.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#51 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#79 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#48 integrate .. //depot/projects/hammer/sys/modules/Makefile#111 integrate .. //depot/projects/hammer/sys/modules/iscsi/Makefile#1 branch .. //depot/projects/hammer/sys/modules/iscsi/initiator/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#70 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#33 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#11 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#65 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#5 integrate .. //depot/projects/hammer/sys/net/netisr.c#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#26 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#13 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#76 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#68 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#45 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.h#1 branch .. //depot/projects/hammer/sys/netinet/tcp_var.h#45 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#19 delete .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/hammer/sys/netinet6/udp6_var.h#5 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#26 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#22 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#10 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#57 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#27 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#39 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#7 integrate .. //depot/projects/hammer/sys/sys/kernel.h#21 integrate .. //depot/projects/hammer/sys/sys/mutex.h#31 integrate .. //depot/projects/hammer/sys/sys/proc.h#106 integrate .. //depot/projects/hammer/sys/sys/vmmeter.h#8 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#60 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#40 integrate .. //depot/projects/hammer/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/hammer/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/hammer/tools/regression/environ/timings.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#12 integrate .. //depot/projects/hammer/usr.bin/su/su.1#12 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#25 integrate .. //depot/projects/hammer/usr.sbin/periodic/periodic.8#4 integrate Differences ... ==== //depot/projects/hammer/contrib/bind9/CHANGES#8 (text+ko) ==== @@ -1,4 +1,34 @@ + --- 9.4.1-P1 released --- + +2206. [security] "allow-query-cache" and "allow-recursion" now + cross inherit from each other. + + If allow-query-cache is not set in named.conf then + allow-recursion is used if set, otherwise allow-query + is used if set, otherwise the default (localnets; + localhost;) is used. + + If allow-recursion is not set in named.conf then + allow-query-cache is used if set, otherwise allow-query + is used if set, otherwise the default (localnets; + localhost;) is used. + + [RT #16987] + +2203. [security] Query id generation was cryptographically weak. + [RT # 16915] + +2202. [security] The default acls for allow-query-cache and + allow-recursion were not being applied. [RT #16960] + +2193. [port] win32: BINDInstall.exe is now linked statically. + [RT #16906] + +2192. [port] win32: use vcredist_x86.exe to install Visual + Studio's redistributable dlls if building with + Visual Stdio 2005 or later. + --- 9.4.1 released --- 2172. [bug] query_addsoa() was being called with a non zone db. ==== //depot/projects/hammer/contrib/bind9/README#7 (text+ko) ==== @@ -43,6 +43,11 @@ Nominum, Inc. +BIND 9.4.1-P1 + + BIND 9.4.1-P1 is a security release, containing a fixes for a + security bugs in BIND 9.4.1. + BIND 9.4.1 BIND 9.4.1 is a security release, containing a fix for a ==== //depot/projects/hammer/contrib/bind9/bin/named/client.c#6 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.20 2006/07/22 01:02:36 marka Exp $ */ +/* $Id: client.c,v 1.219.18.20.14.1 2007/06/26 02:58:54 marka Exp $ */ #include @@ -1440,6 +1440,14 @@ } /* + * Hash the incoming request here as it is after + * dns_dispatch_importrecv(). + */ + dns_dispatch_hash(&client->now, sizeof(client->now)); + dns_dispatch_hash(isc_buffer_base(buffer), + isc_buffer_usedlength(buffer)); + + /* * It's a request. Parse it. */ result = dns_message_parse(client->message, buffer, 0); ==== //depot/projects/hammer/contrib/bind9/bin/named/server.c#6 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.419.18.49 2006/12/07 05:24:19 marka Exp $ */ +/* $Id: server.c,v 1.419.18.49.12.2 2007/07/09 02:23:16 marka Exp $ */ /*! \file */ @@ -1435,12 +1435,12 @@ view->additionalfromcache = ISC_TRUE; } + /* + * Set "allow-query-cache" and "allow-recursion" acls if + * configured in named.conf. + */ CHECK(configure_view_acl(vconfig, config, "allow-query-cache", actx, ns_g_mctx, &view->queryacl)); - if (view->queryacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_defaults, - "allow-query-cache", actx, - ns_g_mctx, &view->queryacl)); if (strcmp(view->name, "_bind") != 0) CHECK(configure_view_acl(vconfig, config, "allow-recursion", @@ -1460,11 +1460,29 @@ "active%s%s", forview, viewname); /* - * Set default "allow-recursion" acl. + * "allow-query-cache" inherits from "allow-recursion" if set, + * otherwise from "allow-query" if set. + * "allow-recursion" inherits from "allow-query-cache" if set, + * otherwise from "allow-query" if set. + */ + if (view->queryacl == NULL && view->recursionacl != NULL) + dns_acl_attach(view->recursionacl, &view->queryacl); + if (view->queryacl == NULL) + CHECK(configure_view_acl(vconfig, config, "allow-query", + actx, ns_g_mctx, &view->queryacl)); + if (view->recursionacl == NULL && view->queryacl != NULL) + dns_acl_attach(view->queryacl, &view->recursionacl); + + /* + * Set default "allow-recursion" and "allow-query-cache" acls. */ if (view->recursionacl == NULL && view->recursion) - CHECK(configure_view_acl(NULL, ns_g_defaults, "allow-recursion", + CHECK(configure_view_acl(NULL, ns_g_config, "allow-recursion", actx, ns_g_mctx, &view->recursionacl)); + if (view->queryacl == NULL) + CHECK(configure_view_acl(NULL, ns_g_config, + "allow-query-cache", actx, + ns_g_mctx, &view->queryacl)); CHECK(configure_view_acl(vconfig, config, "sortlist", actx, ns_g_mctx, &view->sortlist)); ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 (text+ko) ==== @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + BIND 9 Administrator Reference Manual @@ -5827,32 +5827,29 @@ Specifies which hosts are allowed to get answers - from the cache. The default is the builtin acls - localnets and - localhost. + from the cache. If allow-query-cache + is not set then allow-recursion + is used if set, otherwise allow-query + is used if set, otherwise the default + (localnets; + localhost;) is used. - - The way to set query access to the cache is now - via allow-query-cache. - This differs from earlier versions which used - allow-query. - allow-recursion - + Specifies which hosts are allowed to make recursive - queries through this server. If not specified, - the default is to allow recursive queries from - the builtin acls localnets and - localhost. - Note that disallowing recursive queries for a - host does not prevent the host from retrieving - data that is already in the server's cache. - + queries through this server. If + allow-recursion is not set + then allow-query-cache is + used if set, otherwise allow-query + is used if set, otherwise the default + (localnets; + localhost;) is used. + ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -47,15 +47,15 @@
Scope of Document
Organization of This Document
-
Conventions Used in This Document
-
The Domain Name System (DNS)
+
Conventions Used in This Document
+
The Domain Name System (DNS)
-
DNS Fundamentals
-
Domains and Domain Names
-
Zones
-
Authoritative Name Servers
-
Caching Name Servers
-
Name Servers in Multiple Roles
+
DNS Fundamentals
+
Domains and Domain Names
+
Zones
+
Authoritative Name Servers
+
Caching Name Servers
+
Name Servers in Multiple Roles
@@ -116,7 +116,7 @@

-Conventions Used in This Document

+Conventions Used in This Document

In this document, we use the following general typographic conventions: @@ -243,7 +243,7 @@

-The Domain Name System (DNS)

+The Domain Name System (DNS)

The purpose of this document is to explain the installation and upkeep of the BIND software @@ -253,7 +253,7 @@

-DNS Fundamentals

+DNS Fundamentals

The Domain Name System (DNS) is a hierarchical, distributed database. It stores information for mapping Internet host names to @@ -273,7 +273,7 @@

-Domains and Domain Names

+Domains and Domain Names

The data stored in the DNS is identified by domain names that are organized as a tree according to organizational or administrative boundaries. Each node of the tree, @@ -319,7 +319,7 @@

-Zones

+Zones

To properly operate a name server, it is important to understand the difference between a zone @@ -372,7 +372,7 @@

-Authoritative Name Servers

+Authoritative Name Servers

Each zone is served by at least one authoritative name server, @@ -389,7 +389,7 @@

-The Primary Master

+The Primary Master

The authoritative server where the master copy of the zone data is maintained is called the @@ -409,7 +409,7 @@

-Slave Servers

+Slave Servers

The other authoritative servers, the slave servers (also known as secondary servers) @@ -425,7 +425,7 @@

-Stealth Servers

+Stealth Servers

Usually all of the zone's authoritative servers are listed in NS records in the parent zone. These NS records constitute @@ -460,7 +460,7 @@

-Caching Name Servers

+Caching Name Servers

The resolver libraries provided by most operating systems are stub resolvers, meaning that they are not @@ -487,7 +487,7 @@

-Forwarding

+Forwarding

Even a caching name server does not necessarily perform the complete recursive lookup itself. Instead, it can @@ -514,7 +514,7 @@

-Name Servers in Multiple Roles

+Name Servers in Multiple Roles

The BIND name server can simultaneously act as ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -45,16 +45,16 @@

-Hardware requirements

+Hardware requirements

DNS hardware requirements have traditionally been quite modest. @@ -73,7 +73,7 @@

-CPU Requirements

+CPU Requirements

CPU requirements for BIND 9 range from i486-class machines @@ -84,7 +84,7 @@

-Memory Requirements

+Memory Requirements

The memory of the server has to be large enough to fit the cache and zones loaded off disk. The max-cache-size @@ -107,7 +107,7 @@

-Name Server Intensive Environment Issues

+Name Server Intensive Environment Issues

For name server intensive environments, there are two alternative configurations that may be used. The first is where clients and @@ -124,7 +124,7 @@

-Supported Operating Systems

+Supported Operating Systems

ISC BIND 9 compiles and runs on a large number ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -47,14 +47,14 @@

Sample Configurations
-
A Caching-only Name Server
-
An Authoritative-only Name Server
+
A Caching-only Name Server
+
An Authoritative-only Name Server
-
Load Balancing
-
Name Server Operations
+
Load Balancing
+
Name Server Operations
-
Tools for Use With the Name Server Daemon
-
Signals
+
Tools for Use With the Name Server Daemon
+
Signals
@@ -68,7 +68,7 @@ Sample Configurations

-A Caching-only Name Server

+A Caching-only Name Server

The following sample configuration is appropriate for a caching-only name server for use by clients internal to a corporation. All @@ -95,7 +95,7 @@

-An Authoritative-only Name Server

+An Authoritative-only Name Server

This sample configuration is for an authoritative-only server that is the master server for "example.com" @@ -137,7 +137,7 @@

-Load Balancing

+Load Balancing

A primitive form of load balancing can be achieved in the DNS by using multiple A records for @@ -280,10 +280,10 @@

-Name Server Operations

+Name Server Operations

-Tools for Use With the Name Server Daemon

+Tools for Use With the Name Server Daemon

This section describes several indispensable diagnostic, administrative and monitoring tools available to the system @@ -741,7 +741,7 @@

-Signals

+Signals

Certain UNIX signals cause the name server to take specific actions, as described in the following table. These signals can ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -49,28 +49,28 @@

Dynamic Update
The journal file
Incremental Zone Transfers (IXFR)
-
Split DNS
+
Split DNS
TSIG
-
Generate Shared Keys for Each Pair of Hosts
-
Copying the Shared Secret to Both Machines
-
Informing the Servers of the Key's Existence
-
Instructing the Server to Use the Key
-
TSIG Key Based Access Control
-
Errors
+
Generate Shared Keys for Each Pair of Hosts
+
Copying the Shared Secret to Both Machines
+
Informing the Servers of the Key's Existence
+
Instructing the Server to Use the Key
+
TSIG Key Based Access Control
+
Errors
-
TKEY
-
SIG(0)
+
TKEY
+
SIG(0)
DNSSEC
-
Generating Keys
-
Signing the Zone
-
Configuring Servers
+
Generating Keys
+
Signing the Zone
+
Configuring Servers
-
IPv6 Support in BIND 9
+
IPv6 Support in BIND 9
-
Address Lookups Using AAAA Records
-
Address to Name Lookups Using Nibble Format
+
Address Lookups Using AAAA Records
+
Address to Name Lookups Using Nibble Format
@@ -204,7 +204,7 @@

-Split DNS

+Split DNS

Setting up different views, or visibility, of the DNS space to internal and external resolvers is usually referred to as a @@ -479,7 +479,7 @@

-Generate Shared Keys for Each Pair of Hosts

+Generate Shared Keys for Each Pair of Hosts

A shared secret is generated to be shared between host1 and host2. An arbitrary key name is chosen: "host1-host2.". The key name must @@ -487,7 +487,7 @@

-Automatic Generation

+Automatic Generation

The following command will generate a 128-bit (16 byte) HMAC-MD5 key as described above. Longer keys are better, but shorter keys @@ -512,7 +512,7 @@

-Manual Generation

+Manual Generation

The shared secret is simply a random sequence of bits, encoded in base-64. Most ASCII strings are valid base-64 strings (assuming @@ -527,7 +527,7 @@

-Copying the Shared Secret to Both Machines

+Copying the Shared Secret to Both Machines

This is beyond the scope of DNS. A secure transport mechanism should be used. This could be secure FTP, ssh, telephone, etc. @@ -535,7 +535,7 @@

-Informing the Servers of the Key's Existence

+Informing the Servers of the Key's Existence

Imagine host1 and host 2 are @@ -564,7 +564,7 @@

-Instructing the Server to Use the Key

+Instructing the Server to Use the Key

Since keys are shared between two hosts only, the server must be told when keys are to be used. The following is added to the named.conf file @@ -596,7 +596,7 @@

-TSIG Key Based Access Control

+TSIG Key Based Access Control

BIND allows IP addresses and ranges to be specified in ACL @@ -624,7 +624,7 @@

-Errors

+Errors

The processing of TSIG signed messages can result in several errors. If a signed message is sent to a non-TSIG aware @@ -650,7 +650,7 @@

-TKEY

+TKEY

TKEY is a mechanism for automatically generating a shared secret between two hosts. There are several "modes" of @@ -686,7 +686,7 @@

-SIG(0)

+SIG(0)

BIND 9 partially supports DNSSEC SIG(0) transaction signatures as specified in RFC 2535 and RFC2931. @@ -747,7 +747,7 @@

-Generating Keys

+Generating Keys

The dnssec-keygen program is used to generate keys. @@ -798,7 +798,7 @@

-Signing the Zone

+Signing the Zone

The dnssec-signzone program is used to @@ -842,7 +842,7 @@

-Configuring Servers

+Configuring Servers

To enable named to respond appropriately to DNS requests from DNSSEC aware clients, @@ -930,7 +930,7 @@

-IPv6 Support in BIND 9

+IPv6 Support in BIND 9

BIND 9 fully supports all currently defined forms of IPv6 @@ -969,7 +969,7 @@

-Address Lookups Using AAAA Records

+Address Lookups Using AAAA Records

The IPv6 AAAA record is a parallel to the IPv4 A record, and, unlike the deprecated A6 record, specifies the entire @@ -988,7 +988,7 @@

-Address to Name Lookups Using Nibble Format

+Address to Name Lookups Using Nibble Format

When looking up an address in nibble format, the address components are simply reversed, just as in IPv4, and ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -45,13 +45,13 @@

-The Lightweight Resolver Library

+The Lightweight Resolver Library

Traditionally applications have been linked with a stub resolver library that sends recursive DNS queries to a local caching name ==== //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 (text+ko) ==== @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -48,52 +48,52 @@

Configuration File Elements
Address Match Lists
-
Comment Syntax
+
Comment Syntax
Configuration File Grammar
-
acl Statement Grammar
+
acl Statement Grammar
acl Statement Definition and Usage
-
controls Statement Grammar
+
controls Statement Grammar
controls Statement Definition and Usage
-
include Statement Grammar
>>> TRUNCATED FOR MAIL (1000 lines) <<<