PERFORCE change 173817 for review
Alexander Motin
mav at FreeBSD.org
Thu Jan 28 07:47:37 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=173817
Change 173817 by mav at mav_mavbook on 2010/01/28 07:47:22
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/Makefile.inc1#15 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/ls.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/ls.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/print.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#7 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ.xml#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/query.c#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/db.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/ncache.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/types.h#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/rbtdb.c#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/resolver.c#6 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_noop.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_packet.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/version#7 integrate
.. //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/CACerts#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/LICENSE#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/README#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/submit.cf#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/cfhead.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/proto.m4#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/version.m4#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/qtool.pl#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/smcontrol.pl#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/doc/op/op.me#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfapi.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfdef.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/conf.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/ldap.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/sem.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile.m4#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/comm.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/api.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/overview.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/engine.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/example.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/handler.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/libmilter.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/listener.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/worker.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/debug.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/ldap.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/mbdb.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/sem.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-sem.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/smdb1.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/smdb2.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmutil/safefile.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/praliases.8#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/praliases.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile.m4#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/README#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TRACEFLAGS#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/collect.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/deliver.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/envelope.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/headers.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/milter.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/queue.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/ratectrl.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/readcf.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/savemail.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.8#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sfsasl.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/srvrsmtp.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/tls.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/usersmtp.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/util.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/version.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/vacation.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/smbfs/smbutil/view.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.pc98/ttys#2 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#10 integrate
.. //depot/projects/scottl-camlock/src/etc/sendmail/freebsd.mc#3 integrate
.. //depot/projects/scottl-camlock/src/etc/sendmail/freebsd.submit.mc#3 integrate
.. //depot/projects/scottl-camlock/src/etc/services#5 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/lib/bind/dns/code.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/enumclass.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/enumtype.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/rdatastruct.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/getttyent.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#8 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mount.2#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libfetch/fetch.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_accept_sec_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_acquire_cred.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_cred.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_oid_set_member.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_canonicalize_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_compare_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_context_time.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_create_empty_oid_set.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_delete_sec_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_status.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_duplicate_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_sec_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_get_mic.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_sec_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_indicate_mechs.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_init_sec_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_context.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred_by_mech.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_mechs_for_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_names_for_mech.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_process_context_token.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_buffer.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_cred.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_name.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_oid_set.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_test_oid_set_member.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_unwrap.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_verify_mic.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap_size_limit.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gssapi.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/mech.5#3 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_error.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mech_info.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_principal_name.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_versions.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_getcred.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_is_installed.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_max_data_length.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_qop_to_num.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_seccreate.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_callback.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_defaults.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_svc_name.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpcsec_gss.3#2 integrate
.. //depot/projects/scottl-camlock/src/release/amd64/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/i386/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/pc98/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/powerpc/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/sparc64/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/sun4v/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#10 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/init/init.c#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#20 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/gpib.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/nvram.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/pcii.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/tnt4882.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man8/rc.subr.8#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#8 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/northamerica#4 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#98 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#30 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_console.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/LICENSE#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82540.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82541.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82542.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82543.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_manage.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_osdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtwvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vnops.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_key.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/mountver/g_mountver.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_create.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/virstor/g_virstor.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/intr_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/pic.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#42 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#32 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_nfsiod.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#41 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#8 integrate
.. //depot/projects/scottl-camlock/src/tools/make_libdeps.sh#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#8 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/make.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/makefs/makefs.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#6 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/Makefile.inc1#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.640 2010/01/26 10:00:26 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1105,19 +1105,19 @@
gnu/lib/libgcc__L: lib/libc__L
-_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
- ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
- ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
- lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
+ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
+ ${_kerberos5_lib_libroken} \
+ lib/libbz2 lib/libcom_err lib/libcrypt \
lib/libexpat \
- ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
+ ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
- ${_secure_lib_libssl} lib/libdwarf lib/libproc
+ ${_secure_lib_libssl}
.if ${MK_LIBTHR} != "no"
_lib_libthr= lib/libthr
@@ -1136,17 +1136,13 @@
_secure_lib_libcrypto= secure/lib/libcrypto
_secure_lib_libssl= secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
- kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
- lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
- lib/libcrypt__L
-.endif
.if ${MK_OPENSSH} != "no"
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_KERBEROS_SUPPORT} != "no"
-secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
+ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
+ lib/libmd__L kerberos5/lib/libroken__L
.endif
.endif
.endif
@@ -1168,7 +1164,6 @@
_kerberos5_lib_libhx509= kerberos5/lib/libhx509
_kerberos5_lib_libroken= kerberos5/lib/libroken
_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
.endif
.if ${MK_NIS} != "no"
==== //depot/projects/scottl-camlock/src/bin/ls/ls.c#4 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.89 2010/01/24 19:23:07 jh Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -508,7 +508,7 @@
break;
case FTS_DNR:
case FTS_ERR:
- warnx("%s: %s", p->fts_name, strerror(p->fts_errno));
+ warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
rval = 1;
break;
case FTS_D:
@@ -559,7 +559,8 @@
long maxblock;
u_long btotal, labelstrlen, maxinode, maxlen, maxnlink;
u_long maxlabelstr;
- int bcfile, maxflags;
+ u_int devstrlen;
+ int maxflags;
gid_t maxgroup;
uid_t maxuser;
size_t flen, ulen, glen;
@@ -651,7 +652,7 @@
MAKENINES(maxsize);
free(jinitmax);
}
- bcfile = 0;
+ devstrlen = 0;
flags = NULL;
for (cur = list, entries = 0; cur; cur = cur->fts_link) {
if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) {
@@ -791,9 +792,15 @@
np->group = &np->data[ulen + 1];
(void)strcpy(np->group, group);
- if (S_ISCHR(sp->st_mode) ||
- S_ISBLK(sp->st_mode))
- bcfile = 1;
+ if ((S_ISCHR(sp->st_mode) ||
+ S_ISBLK(sp->st_mode)) &&
+ devstrlen < DEVSTR_HEX_LEN) {
+ if (minor(sp->st_rdev) > 255 ||
+ minor(sp->st_rdev) < 0)
+ devstrlen = DEVSTR_HEX_LEN;
+ else
+ devstrlen = DEVSTR_LEN;
+ }
if (f_flags) {
np->flags = &np->data[ulen + glen + 2];
@@ -825,7 +832,6 @@
d.entries = entries;
d.maxlen = maxlen;
if (needstats) {
- d.bcfile = bcfile;
d.btotal = btotal;
(void)snprintf(buf, sizeof(buf), "%lu", maxblock);
d.s_block = strlen(buf);
@@ -836,8 +842,14 @@
d.s_inode = strlen(buf);
(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
d.s_nlink = strlen(buf);
- (void)snprintf(buf, sizeof(buf), "%ju", maxsize);
- d.s_size = strlen(buf);
+ if (f_humanval)
+ d.s_size = HUMANVALSTR_LEN;
+ else {
+ (void)snprintf(buf, sizeof(buf), "%ju", maxsize);
+ d.s_size = strlen(buf);
+ }
+ if (d.s_size < devstrlen)
+ d.s_size = devstrlen;
d.s_user = maxuser;
}
printfcn(&d);
==== //depot/projects/scottl-camlock/src/bin/ls/ls.h#3 (text+ko) ====
@@ -30,11 +30,15 @@
* SUCH DAMAGE.
*
* from: @(#)ls.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $
+ * $FreeBSD: src/bin/ls/ls.h,v 1.24 2010/01/24 19:23:07 jh Exp $
*/
#define NO_PRINT 1
+#define HUMANVALSTR_LEN 5
+#define DEVSTR_LEN 8
+#define DEVSTR_HEX_LEN 15
+
extern long blocksize; /* block size units */
extern int f_accesstime; /* use time of last access */
@@ -62,7 +66,6 @@
typedef struct {
FTSENT *list;
u_long btotal;
- int bcfile;
int entries;
int maxlen;
u_int s_block;
==== //depot/projects/scottl-camlock/src/bin/ls/print.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.80 2009/09/02 20:50:39 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.81 2010/01/24 19:23:07 jh Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -62,6 +62,7 @@
#include "extern.h"
static int printaname(const FTSENT *, u_long, u_long);
+static void printdev(size_t, dev_t);
static void printlink(const FTSENT *);
static void printtime(time_t);
static int printtype(u_int);
@@ -165,16 +166,7 @@
if (f_label)
(void)printf("%-*s ", dp->s_label, np->label);
if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
- if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0)
- (void)printf("%3d, 0x%08x ",
- major(sp->st_rdev),
- (u_int)minor(sp->st_rdev));
- else
- (void)printf("%3d, %3d ",
- major(sp->st_rdev), minor(sp->st_rdev));
- else if (dp->bcfile)
- (void)printf("%*s%*jd ",
- 8 - dp->s_size, "", dp->s_size, sp->st_size);
+ printdev(dp->s_size, sp->st_rdev);
else
printsize(dp->s_size, sp->st_size);
if (f_accesstime)
@@ -353,6 +345,24 @@
return (chcnt);
}
+/*
+ * Print device special file major and minor numbers.
+ */
+static void
+printdev(size_t width, dev_t dev)
+{
+ char buf[DEVSTR_HEX_LEN + 1];
+
+ if (minor(dev) > 255 || minor(dev) < 0)
+ (void)snprintf(buf, sizeof(buf), "%3d, 0x%08x",
+ major(dev), (u_int)minor(dev));
+ else
+ (void)snprintf(buf, sizeof(buf), "%3d, %3d",
+ major(dev), minor(dev));
+
+ (void)printf("%*s ", (u_int)width, buf);
+}
+
static void
printtime(time_t ftime)
{
@@ -592,11 +602,15 @@
{
if (f_humanval) {
- char buf[5];
+ /*
+ * Reserve one space before the size and allocate room for
+ * the trailing '\0'.
+ */
+ char buf[HUMANVALSTR_LEN - 1 + 1];
humanize_number(buf, sizeof(buf), (int64_t)bytes, "",
HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
- (void)printf("%5s ", buf);
+ (void)printf("%*s ", (u_int)width, buf);
} else
(void)printf("%*jd ", (u_int)width, bytes);
}
==== //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#7 (text+ko) ====
@@ -1,3 +1,15 @@
+ --- 9.6.1-P3 released ---
+
+2831. [security] Do not attempt to validate or cache
+ out-of-bailiwick data returned with a secure
+ answer; it must be re-fetched from its original
+ source and validated in that context. [RT #20819]
+
+2828. [security] Cached CNAME or DNAME RR could be returned to clients
+ without DNSSEC validation. [RT #20737]
+
+2827. [security] Bogus NXDOMAIN could be cached as if valid. [RT #20712]
+
--- 9.6.1-P2 released ---
2772. [security] When validating, track whether pending data was from
==== //depot/projects/scottl-camlock/src/contrib/bind9/FAQ#4 (text+ko) ====
@@ -153,24 +153,29 @@
Master 10.0.1.1:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
view "internal" {
- match-clients { !key external; 10.0.1/24; };
+ match-clients { !key external; // reject message ment for the
+ // external view.
+ 10.0.1/24; }; // accept from these addresses.
...
};
view "external" {
match-clients { key external; any; };
- server 10.0.1.2 { keys external; };
+ server 10.0.1.2 { keys external; }; // tag messages from the
+ // external view to the
+ // other servers for the
+ // view.
recursion no;
...
};
Slave 10.0.1.2:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
@@ -220,13 +225,13 @@
Master 10.0.1.1:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
key "mykey" {
- algorithm hmac-md5;
- secret "yyyyyyyy";
+ algorithm hmac-sha256;
+ secret "yyyyyyyyyyyyyyyyyyyyyyyy";
};
view "internal" {
@@ -239,7 +244,7 @@
type master;
file "internal/example.db";
allow-update { key mykey; };
- notify-also { 10.0.1.1; };
+ also-notify { 10.0.1.1; };
};
};
@@ -249,7 +254,7 @@
type slave;
file "external/example.db";
masters { 10.0.1.1; };
- transfer-source { 10.0.1.1; };
+ transfer-source 10.0.1.1;
// allow-update-forwarding { any; };
// allow-notify { ... };
};
==== //depot/projects/scottl-camlock/src/contrib/bind9/FAQ.xml#4 (text+ko) ====
@@ -17,7 +17,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
-<!-- $Id: FAQ.xml,v 1.46.56.4 2009/02/19 01:51:58 tbox Exp $ -->
+<!-- $Id: FAQ.xml,v 1.46.56.4.12.1 2009/12/31 23:17:56 tbox Exp $ -->
<article class="faq">
<title>Frequently Asked Questions about BIND 9</title>
@@ -319,24 +319,29 @@
<programlisting>
Master 10.0.1.1:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
view "internal" {
- match-clients { !key external; 10.0.1/24; };
+ match-clients { !key external; // reject message ment for the
+ // external view.
+ 10.0.1/24; }; // accept from these addresses.
...
};
view "external" {
match-clients { key external; any; };
- server 10.0.1.2 { keys external; };
+ server 10.0.1.2 { keys external; }; // tag messages from the
+ // external view to the
+ // other servers for the
+ // view.
recursion no;
...
};
Slave 10.0.1.2:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
view "internal" {
match-clients { !key external; 10.0.1/24; };
@@ -424,13 +429,13 @@
<programlisting>
Master 10.0.1.1:
key "external" {
- algorithm hmac-md5;
- secret "xxxxxxxx";
+ algorithm hmac-sha256;
+ secret "xxxxxxxxxxxxxxxxxxxxxxxx";
};
key "mykey" {
- algorithm hmac-md5;
- secret "yyyyyyyy";
+ algorithm hmac-sha256;
+ secret "yyyyyyyyyyyyyyyyyyyyyyyy";
};
view "internal" {
@@ -443,7 +448,7 @@
type master;
file "internal/example.db";
allow-update { key mykey; };
- notify-also { 10.0.1.1; };
+ also-notify { 10.0.1.1; };
};
};
@@ -453,7 +458,7 @@
type slave;
file "external/example.db";
masters { 10.0.1.1; };
- transfer-source { 10.0.1.1; };
+ transfer-source 10.0.1.1;
// allow-update-forwarding { any; };
// allow-notify { ... };
};
==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 (text+ko) ====
@@ -13,163 +13,287 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: dnssec-signzone.8,v 1.47.44.4 2009/06/09 01:47:19 each Exp $
+.\" $Id: dnssec-signzone.8,v 1.47.44.4.8.1 2009/12/31 23:17:46 tbox Exp $
.\"
.hy 0
.ad l
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "DNSSEC-SIGNZONE" 8 "June 08, 2009" "" ""
-.SH NAME
-dnssec-signzone \- DNSSEC zone signing tool
+.\" Title: dnssec\-signzone
+.\" Author:
+.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\" Date: June 08, 2009
+.\" Manual: BIND9
+.\" Source: BIND9
+.\"
+.TH "DNSSEC\-SIGNZONE" "8" "June 08, 2009" "BIND9" "BIND9"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+dnssec\-signzone \- DNSSEC zone signing tool
.SH "SYNOPSIS"
.HP 16
-\fBdnssec\-signzone\fR [\fB\-a\fR] [\fB\-c\ \fIclass\fR\fR] [\fB\-d\ \fIdirectory\fR\fR] [\fB\-e\ \fIend\-time\fR\fR] [\fB\-f\ \fIoutput\-file\fR\fR] [\fB\-g\fR] [\fB\-h\fR] [\fB\-k\ \fIkey\fR\fR] [\fB\-l\ \fIdomain\fR\fR] [\fB\-i\ \fIinterval\fR\fR] [\fB\-I\ \fIinput\-format\fR\fR] [\fB\-j\ \fIjitter\fR\fR] [\fB\-N\ \fIsoa\-serial\-format\fR\fR] [\fB\-o\ \fIorigin\fR\fR] [\fB\-O\ \fIoutput\-format\fR\fR] [\fB\-p\fR] [\fB\-r\ \fIrandomdev\fR\fR] [\fB\-s\ \fIstart\-time\fR\fR] [\fB\-t\fR] [\fB\-v\ \fIlevel\fR\fR] [\fB\-z\fR] [\fB\-3\ \fIsalt\fR\fR] [\fB\-H\ \fIiterations\fR\fR] [\fB\-A\fR] {zonefile} [key...]
+\fBdnssec\-signzone\fR [\fB\-a\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-d\ \fR\fB\fIdirectory\fR\fR] [\fB\-e\ \fR\fB\fIend\-time\fR\fR] [\fB\-f\ \fR\fB\fIoutput\-file\fR\fR] [\fB\-g\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkey\fR\fR] [\fB\-l\ \fR\fB\fIdomain\fR\fR] [\fB\-i\ \fR\fB\fIinterval\fR\fR] [\fB\-I\ \fR\fB\fIinput\-format\fR\fR] [\fB\-j\ \fR\fB\fIjitter\fR\fR] [\fB\-N\ \fR\fB\fIsoa\-serial\-format\fR\fR] [\fB\-o\ \fR\fB\fIorigin\fR\fR] [\fB\-O\ \fR\fB\fIoutput\-format\fR\fR] [\fB\-p\fR] [\fB\-r\ \fR\fB\fIrandomdev\fR\fR] [\fB\-s\ \fR\fB\fIstart\-time\fR\fR] [\fB\-t\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fB\-z\fR] [\fB\-3\ \fR\fB\fIsalt\fR\fR] [\fB\-H\ \fR\fB\fIiterations\fR\fR] [\fB\-A\fR] {zonefile} [key...]
.SH "DESCRIPTION"
.PP
-\fBdnssec\-signzone\fR signs a zone\&. It generates NSEC and RRSIG records and produces a signed version of the zone\&. The security status of delegations from the signed zone (that is, whether the child zones are secure or not) is determined by the presence or absence of a \fIkeyset\fR file for each child zone\&.
+\fBdnssec\-signzone\fR
+signs a zone. It generates NSEC and RRSIG records and produces a signed version of the zone. The security status of delegations from the signed zone (that is, whether the child zones are secure or not) is determined by the presence or absence of a
+\fIkeyset\fR
+file for each child zone.
.SH "OPTIONS"
-.TP
+.PP
\-a
-Verify all generated signatures\&.
-.TP
+.RS 4
+Verify all generated signatures.
+.RE
+.PP
\-c \fIclass\fR
-Specifies the DNS class of the zone\&.
-.TP
+.RS 4
+Specifies the DNS class of the zone.
+.RE
+.PP
\-k \fIkey\fR
-Treat specified key as a key signing key ignoring any key flags\&. This option may be specified multiple times\&.
-.TP
+.RS 4
+Treat specified key as a key signing key ignoring any key flags. This option may be specified multiple times.
+.RE
+.PP
\-l \fIdomain\fR
-Generate a DLV set in addition to the key (DNSKEY) and DS sets\&. The domain is appended to the name of the records\&.
-.TP
+.RS 4
+Generate a DLV set in addition to the key (DNSKEY) and DS sets. The domain is appended to the name of the records.
+.RE
+.PP
\-d \fIdirectory\fR
-Look for \fIkeyset\fR files in \fBdirectory\fR as the directory
-.TP
+.RS 4
+Look for
+\fIkeyset\fR
+files in
+\fBdirectory\fR
+as the directory
+.RE
+.PP
\-g
-Generate DS records for child zones from keyset files\&. Existing DS records will be removed\&.
-.TP
+.RS 4
+Generate DS records for child zones from keyset files. Existing DS records will be removed.
+.RE
+.PP
\-s \fIstart\-time\fR
-Specify the date and time when the generated RRSIG records become valid\&. This can be either an absolute or relative time\&. An absolute start time is indicated by a number in YYYYMMDDHHMMSS notation; 20000530144500 denotes 14:45:00 UTC on May 30th, 2000\&. A relative start time is indicated by +N, which is N seconds from the current time\&. If no \fBstart\-time\fR is specified, the current time minus 1 hour (to allow for clock skew) is used\&.
-.TP
+.RS 4
+Specify the date and time when the generated RRSIG records become valid. This can be either an absolute or relative time. An absolute start time is indicated by a number in YYYYMMDDHHMMSS notation; 20000530144500 denotes 14:45:00 UTC on May 30th, 2000. A relative start time is indicated by +N, which is N seconds from the current time. If no
+\fBstart\-time\fR
+is specified, the current time minus 1 hour (to allow for clock skew) is used.
+.RE
+.PP
\-e \fIend\-time\fR
-Specify the date and time when the generated RRSIG records expire\&. As with \fBstart\-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation\&. A time relative to the start time is indicated with +N, which is N seconds from the start time\&. A time relative to the current time is indicated with now+N\&. If no \fBend\-time\fR is specified, 30 days from the start time is used as a default\&.
-.TP
+.RS 4
+Specify the date and time when the generated RRSIG records expire. As with
+\fBstart\-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from the start time. A time relative to the current time is indicated with now+N. If no
+\fBend\-time\fR
+is specified, 30 days from the start time is used as a default.
+.RE
+.PP
\-f \fIoutput\-file\fR
-The name of the output file containing the signed zone\&. The default is to append \fI\&.signed\fR to the input filename\&.
-.TP
+.RS 4
+The name of the output file containing the signed zone. The default is to append
+\fI.signed\fR
+to the input filename.
+.RE
+.PP
\-h
-Prints a short summary of the options and arguments to \fBdnssec\-signzone\fR\&.
-.TP
+.RS 4
+Prints a short summary of the options and arguments to
+\fBdnssec\-signzone\fR.
+.RE
+.PP
\-i \fIinterval\fR
-When a previously\-signed zone is passed as input, records may be resigned\&. The \fBinterval\fR option specifies the cycle interval as an offset from the current time (in seconds)\&. If a RRSIG record expires after the cycle interval, it is retained\&. Otherwise, it is considered to be expiring soon, and it will be replaced\&.
-The default cycle interval is one quarter of the difference between the signature end and start times\&. So if neither \fBend\-time\fR or \fBstart\-time\fR are specified, \fBdnssec\-signzone\fR generates signatures that are valid for 30 days, with a cycle interval of 7\&.5 days\&. Therefore, if any existing RRSIG records are due to expire in less than 7\&.5 days, they would be replaced\&.
-.TP
+.RS 4
+When a previously\-signed zone is passed as input, records may be resigned. The
+\fBinterval\fR
+option specifies the cycle interval as an offset from the current time (in seconds). If a RRSIG record expires after the cycle interval, it is retained. Otherwise, it is considered to be expiring soon, and it will be replaced.
+.sp
+The default cycle interval is one quarter of the difference between the signature end and start times. So if neither
+\fBend\-time\fR
+or
+\fBstart\-time\fR
+are specified,
+\fBdnssec\-signzone\fR
+generates signatures that are valid for 30 days, with a cycle interval of 7.5 days. Therefore, if any existing RRSIG records are due to expire in less than 7.5 days, they would be replaced.
+.RE
+.PP
\-I \fIinput\-format\fR
-The format of the input zone file\&. Possible formats are \fB"text"\fR (default) and \fB"raw"\fR\&. This option is primarily intended to be used for dynamic signed zones so that the dumped zone file in a non\-text format containing updates can be signed directly\&. The use of this option does not make much sense for non\-dynamic zones\&.
-.TP
+.RS 4
+The format of the input zone file. Possible formats are
+\fB"text"\fR
+(default) and
+\fB"raw"\fR. This option is primarily intended to be used for dynamic signed zones so that the dumped zone file in a non\-text format containing updates can be signed directly. The use of this option does not make much sense for non\-dynamic zones.
+.RE
+.PP
\-j \fIjitter\fR
-When signing a zone with a fixed signature lifetime, all RRSIG records issued at the time of signing expires simultaneously\&. If the zone is incrementally signed, i\&.e\&. a previously\-signed zone is passed as input to the signer, all expired signatures have to be regenerated at about the same time\&. The \fBjitter\fR option specifies a jitter window that will be used to randomize the signature expire time, thus spreading incremental signature regeneration over time\&.
-Signature lifetime jitter also to some extent benefits validators and servers by spreading out cache expiration, i\&.e\&. if large numbers of RRSIGs don't expire at the same time from all caches there will be less congestion than if all validators need to refetch at mostly the same time\&.
-.TP
+.RS 4
+When signing a zone with a fixed signature lifetime, all RRSIG records issued at the time of signing expires simultaneously. If the zone is incrementally signed, i.e. a previously\-signed zone is passed as input to the signer, all expired signatures have to be regenerated at about the same time. The
+\fBjitter\fR
+option specifies a jitter window that will be used to randomize the signature expire time, thus spreading incremental signature regeneration over time.
+.sp
+Signature lifetime jitter also to some extent benefits validators and servers by spreading out cache expiration, i.e. if large numbers of RRSIGs don't expire at the same time from all caches there will be less congestion than if all validators need to refetch at mostly the same time.
+.RE
+.PP
\-n \fIncpus\fR
-Specifies the number of threads to use\&. By default, one thread is started for each detected CPU\&.
-.TP
+.RS 4
+Specifies the number of threads to use. By default, one thread is started for each detected CPU.
+.RE
+.PP
\-N \fIsoa\-serial\-format\fR
-The SOA serial number format of the signed zone\&. Possible formats are \fB"keep"\fR (default), \fB"increment"\fR and \fB"unixtime"\fR\&.
-.RS
-.TP
+.RS 4
+The SOA serial number format of the signed zone. Possible formats are
+\fB"keep"\fR
+(default),
+\fB"increment"\fR
+and
+\fB"unixtime"\fR.
+.RS 4
+.PP
\fB"keep"\fR
-Do not modify the SOA serial number\&.
-.TP
+.RS 4
+Do not modify the SOA serial number.
+.RE
+.PP
\fB"increment"\fR
-Increment the SOA serial number using RFC 1982 arithmetics\&.
-.TP
+.RS 4
+Increment the SOA serial number using RFC 1982 arithmetics.
+.RE
+.PP
\fB"unixtime"\fR
-Set the SOA serial number to the number of seconds since epoch\&.
+.RS 4
+Set the SOA serial number to the number of seconds since epoch.
+.RE
+.RE
.RE
-.IP
-.TP
+.PP
\-o \fIorigin\fR
-The zone origin\&. If not specified, the name of the zone file is assumed to be the origin\&.
-.TP
+.RS 4
+The zone origin. If not specified, the name of the zone file is assumed to be the origin.
+.RE
+.PP
\-O \fIoutput\-format\fR
-The format of the output file containing the signed zone\&. Possible formats are \fB"text"\fR (default) and \fB"raw"\fR\&.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list