PERFORCE change 20911 for review
Robert Watson
rwatson at freebsd.org
Sat Nov 9 23:48:02 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=20911
Change 20911 by rwatson at rwatson_tislabs on 2002/11/09 15:47:15
Integ the TrustedBSD MAC tree: loop back various MAC changes
(AST, execlabel, mac_exec generally, etc), as well as other
main tree changes.
Affected files ...
.. //depot/projects/trustedbsd/mac/MAINTAINERS#10 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.c#19 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/print.c#14 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/trustedbsd/mac/etc/namedb/named.root#2 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.subr#7 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.tgt#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#21 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_exec.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#16 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_i386_disk.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libfetch/fetch.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#4 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile#34 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/dokern.sh#6 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#8 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#28 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#44 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#5 integrate
.. //depot/projects/trustedbsd/mac/release/ia64/doFS.sh#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#10 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/reboot/nextboot.8#2 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libcipher/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#10 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.asm#2 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#7 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#9 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libtelnet/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#21 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/fwe.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/rl.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man5/passwd.5#3 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#18 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpx.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/bluetooth/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/common/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/common/ng_bluetooth.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/TODO#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_prse.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_var.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/TODO#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/TODO#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_main.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_prse.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_var.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bluetooth.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bt3c.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_hci_raw.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_l2cap.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_h4.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_hci.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_l2cap.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_ubt.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/TODO#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_main.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_prse.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_var.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/TODO#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.4#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#30 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#69 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#21 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#18 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#13 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/majors#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_core.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus_cis.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/README#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxpvar.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_buffer.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_init.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_receive.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_transmit.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_vcm.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_output.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_receive.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ida/ida.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcdvar.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/musycc/musycc.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pcfclock.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pps.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/rc/rc.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/si/si_isa.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_puc.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudioreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sr/if_srregs.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/tga/tga_pci.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ubsec/ubsec.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumdaemon.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinuminterrupt.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrevive.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/wds/wd7000.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_smb.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom.h#14 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#31 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/exception.s#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86bios.s#3 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/pcb.h#9 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/reg.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/vm86.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/vmparam.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_lockf.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#353 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mib.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#43 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#51 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aac/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/apm/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/bktr/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/cam/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/drm/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/ed/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/ep/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/fdc/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/fe/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/firewire/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/hfa/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/i2c/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/i2c/controllers/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/lnc/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/lomac/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/msdosfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/oldcard/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/pcspeaker/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/pmc/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/mss/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/sbc/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/splash/bmp/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/syscons/apm/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/syscons/daemon/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/syscons/dragon/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/syscons/snake/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/syscons/star/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/sysvipc/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_device.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_signal.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_stack.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_if.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_load.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_var.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/port.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_kxdr.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/q2110_sigaa.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/q2110_sigcpcs.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/qsaal1_sigaa.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/qsaal1_sigcpcs.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_lower.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_upper.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_var.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_lower.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_pdu.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_sigaa.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_sigcpcs.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_subr.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_upper.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_var.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_decode.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_encode.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_var.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_bridge.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_parse.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netipx/ipx_ip.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netncp/ncp_rq.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/opencrypto/crypto.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/amd.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/intpm.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/machdep.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#182 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#65 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#145 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#104 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#80 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebus.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/ofw_bus.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/ver.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/pci/ofw_pci.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/pci/ofw_pci.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/pci/psycho.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/identcpu.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/ofw_bus.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#168 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mchain.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mount.h#22 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#31 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_init.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#13 integrate
.. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#2 integrate
.. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#2 integrate
.. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch
.. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#9 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/make/var.c#10 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/yes/yes.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/adduser/adduser.8#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.8#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.h#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/info.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_control.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_policy.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/node.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/send_recv.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/status.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/util.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.8#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2cap.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.8#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.h#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.8#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/delete/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/url.c#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#10 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#17 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/MAINTAINERS#10 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.49 2002/10/30 04:53:58 des Exp $
+$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $
subsystem login notes
-----------------------------
@@ -84,3 +84,4 @@
etc/rc.* gordon Requests heads-up to help keep etc/rc.d in sync.
fdc(4) joerg Just keep me informed of changes, try not to break it.
sppp(4) joerg Just keep me informed of changes, try not to break it.
+make make Recommends pre-commit review.
==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#19 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.70 2002/10/27 17:44:32 wollman Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.71 2002/11/06 01:18:12 tjr Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -330,7 +330,7 @@
f_color = 1;
}
#else
- (void)fprintf(stderr, "Color support not compiled in.\n");
+ warnx("color support not compiled in");
#endif /*COLORLS*/
#ifdef COLORLS
@@ -691,9 +691,7 @@
error = mac_prepare_file_label(&label);
if (error == -1) {
- fprintf(stderr, "%s: %s\n",
- cur->fts_name,
- strerror(errno));
+ warn("%s", cur->fts_name);
goto label_out;
}
@@ -712,7 +710,7 @@
error = mac_get_link(name,
label);
if (error == -1) {
- perror(cur->fts_name);
+ warn("%s", cur->fts_name);
mac_free(label);
goto label_out;
}
@@ -720,9 +718,7 @@
error = mac_to_text(label,
&labelstr);
if (error == -1) {
- fprintf(stderr, "%s: %s\n",
- cur->fts_name,
- strerror(errno));
+ warn("%s", cur->fts_name);
mac_free(label);
goto label_out;
}
==== //depot/projects/trustedbsd/mac/bin/ls/print.c#14 (text+ko) ====
@@ -40,7 +40,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.62 2002/11/03 07:29:08 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.63 2002/11/06 01:18:12 tjr Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -558,10 +558,9 @@
if (c[j] >= '0' && c[j] <= '7') {
colors[i].num[j] = c[j] - '0';
if (!legacy_warn) {
- fprintf(stderr,
- "warn: LSCOLORS should use "
+ warnx("LSCOLORS should use "
"characters a-h instead of 0-9 ("
- "see the manual page)\n");
+ "see the manual page)");
}
legacy_warn = 1;
} else if (c[j] >= 'a' && c[j] <= 'h')
@@ -572,9 +571,8 @@
} else if (tolower((unsigned char)c[j] == 'x'))
colors[i].num[j] = -1;
else {
- fprintf(stderr,
- "error: invalid character '%c' in LSCOLORS"
- " env var\n", c[j]);
+ warnx("invalid character '%c' in LSCOLORS"
+ " env var", c[j]);
colors[i].num[j] = -1;
}
}
==== //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#5 (text+ko) ====
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd_config.5,v 1.13 2002/09/16 20:12:11 stevesk Exp $
-.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.8 2002/11/05 17:24:01 des Exp $
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.9 2002/11/06 08:04:56 des Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -132,6 +132,11 @@
this controls the use of PAM (see
.Xr pam 3 )
for authentication.
+Note that this affects the effectiveness of the
+.Cm PasswordAuthentication
+and
+.Cm PermitRootLogin
+variables.
The default is
.Dq yes .
.It Cm Ciphers
@@ -426,6 +431,17 @@
Specifies whether password authentication is allowed.
The default is
.Dq yes .
+Note that
+.Cm ChallengeResponseAuthentication
+is
+.Dq yes ,
+and the PAM authentication policy for
+.Nm sshd
+includes
+.Xr pam_unix 8 ,
+password authentication will be allowed through the challenge-response
+mechanism regardless of the value of
+.Cm PasswordAuthentication .
.It Cm PermitEmptyPasswords
When password authentication is allowed, it specifies whether the
server allows login to accounts with empty password strings.
@@ -442,6 +458,13 @@
.Dq no .
The default is
.Dq no .
+Note that if
+.Cm ChallengeResponseAuthentication
+is
+.Dq yes ,
+the root user may be allowed in with its password even if
+.Cm PermitRootLogin is set to
+.Dq without-password .
.Pp
If this option is set to
.Dq without-password
==== //depot/projects/trustedbsd/mac/etc/namedb/named.root#2 (text+ko) ====
@@ -1,20 +1,20 @@
+;
+; $FreeBSD: src/etc/namedb/named.root,v 1.10 2002/11/06 09:21:39 dougb Exp $
+;
+
; This file holds the information on root name servers needed to
; initialize cache of Internet domain name servers
; (e.g. reference this file in the "cache . <file>"
; configuration file of BIND domain name servers).
;
-; This file is made available by InterNIC registration services
+; This file is made available by InterNIC
; under anonymous FTP as
; file /domain/named.root
-; on server FTP.RS.INTERNIC.NET
-; -OR- under Gopher at RS.INTERNIC.NET
-; under menu InterNIC Registration Services (NSI)
-; submenu InterNIC Registration Archives
-; file named.root
+; on server FTP.INTERNIC.NET
+;
+; last update: Nov 5, 2002
+; related version of root zone: 2002110501
;
-; last update: Aug 22, 1997
-; related version of root zone: 1997082200
-; $FreeBSD: src/etc/namedb/named.root,v 1.9 1999/09/13 17:09:08 peter Exp $
;
; formerly NS.INTERNIC.NET
;
@@ -61,17 +61,17 @@
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
;
-; temporarily housed at NSI (InterNIC)
+; operated by VeriSign, Inc.
;
. 3600000 NS J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET. 3600000 A 198.41.0.10
+J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
;
; housed in LINX, operated by RIPE NCC
;
. 3600000 NS K.ROOT-SERVERS.NET.
K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
;
-; temporarily housed at ISI (IANA)
+; operated by IANA
;
. 3600000 NS L.ROOT-SERVERS.NET.
L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12
==== //depot/projects/trustedbsd/mac/etc/rc.subr#7 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.6 2002/09/12 17:27:36 gordon Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -132,7 +132,7 @@
return 1
;;
*)
- warn "\$${1} is not set properly."
+ warn "\$${1} is not set properly - see rc.conf(5)."
return 1
;;
esac
@@ -839,7 +839,7 @@
#
rc_usage()
{
- echo -n 1>&2 "usage: $0 [fast|force]("
+ echo -n 1>&2 "Usage: $0 [fast|force]("
_sep=
for _elem in $*; do
@@ -851,18 +851,6 @@
}
#
-# _echo prefix message
-# Display message preceded by "$prefix:". Log to syslog as well.
-# XXX - syslogd may not be listening (especially if this subroutine
-# is called at boot before syslogd has had a chance to startup).
-#
-_echo()
-{
- [ -x /usr/bin/logger ] && /usr/bin/logger "$0: $1: $2"
- echo "$0: $1: $2"
-}
-
-#
# err exitval message
# Display message to stderr and log to the syslog, and exit with exitval.
#
@@ -871,7 +859,10 @@
exitval=$1
shift
- _echo 1>&2 "ERROR" "$*"
+ if [ -x /usr/bin/logger ]; then
+ logger "$0: ERROR: $*"
+ fi
+ echo 1>&2 "$0: ERROR: $*"
exit $exitval
}
@@ -881,7 +872,10 @@
#
warn()
{
- _echo 1>&2 "WARNING" "$*"
+ if [ -x /usr/bin/logger ]; then
+ logger "$0: WARNING: $*"
+ fi
+ echo 1>&2 "$0: WARNING: $*"
}
#
@@ -890,12 +884,15 @@
#
info()
{
- _echo "INFO" "$*"
+ if [ -x /usr/bin/logger ]; then
+ logger "$0: INFO: $*"
+ fi
+ echo "$0: INFO: $*"
}
#
# debug message
-# If debugging is enabled in rc.conf output message to stderr and syslog.
+# If debugging is enabled in rc.conf output message to stderr.
# BEWARE that you don't call any subroutine that itself calls this
# function.
#
@@ -903,7 +900,7 @@
{
case ${rc_debug} in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- _echo 1>&2 "DEBUG" "$*"
+ echo 1>&2 "$0: DEBUG: $*"
return
;;
esac
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.tgt#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.5 2002/09/12 15:56:20 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.6 2002/11/06 07:00:59 obrien Exp $
TARGET_ARCH?= ${MACHINE_ARCH}
@@ -15,4 +15,5 @@
.elif ${TARGET_ARCH} == "sparc64"
GCC_CPU= sparc
TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
+CFLAGS+= -DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT}
.endif
==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#21 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.11 2002/10/22 14:36:11 rwatson Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $
MAINTAINER= rwatson at FreeBSD.org
==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl.3#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2000, 2001 Robert N. M. Watson
+.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.18 2001/10/01 16:08:56 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.19 2002/11/08 15:01:28 rwatson Exp $
.\"
.Dd January 28, 2000
.Dt ACL 3
@@ -179,11 +179,9 @@
routines may change over time, and as such are not documented.
They are not intended to be called directly without going through the
library.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
.Sh SEE ALSO
+.Xr getfacl 1 ,
+.Xr setfacl 1 ,
.Xr acl_add_perm 3 ,
.Xr acl_calc_mask 3 ,
.Xr acl_clear_perms 3 ,
@@ -227,6 +225,12 @@
.Fx 4.0 ;
.Fx 5.0
was the first version to include a complete ACL implementation based
-on extended attributes.
+on extended attributes for the UFS and UFS2 file systems.
+.Pp
+.Xr getfacl 1
+and
+.Xr setfacl 1
+describe the user tools that permit direct manipulation of complete file
+ACLs.
.Sh AUTHORS
.An Robert N M Watson
==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_exec.c#3 (text+ko) ====
==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#10 (text+ko) ====
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.2 2002/10/28 23:06:04 chris Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.4 2002/11/06 17:38:18 chris Exp $
.Dd December 21, 2001
.Dt MAC_TEXT 3
.Sh NAME
@@ -42,67 +42,39 @@
.Lb libc
.Sh SYNOPSIS
.In sys/mac.h
-.Ft mac_t
-.Fn mac_from_text "const char *text_p"
-.Ft "char *"
-.Fn mac_to_text "mac_t label" "size_t *len_p"
+.Ft int
+.Fn mac_from_text "mac_t *mac" "const char *text"
+.Ft int
+.Fn mac_to_text "mac_t label" "char **text"
.Sh DESCRIPTION
The
.Fn mac_from_text
function converts the text representation of a label
-into a
-.Vt mac_t ,
+into the internal policy label format
+.Vt ( mac_t )
+and places it in
+.Fa *mac ,
which must later be freed with
-.Xr mac_free .
+.Xr mac_free 3 .
+.Pp
The
.Fn mac_to_text
-function returns
-the text representation of
-.Fa label
-and sets
-.Fa *len_p
-to the length of the returned string.
+function allocates storage for
+.Fa *text ,
+which will be set to the text representation of
+.Fa label .
.Pp
Refer to
.Xr maclabel 7
for the MAC label format.
.Sh RETURN VALUES
-The
-.Fn mac_from_text
-function returns a valid
-.Vt mac_t
-equivalent to
-the MAC label described in
-.Fa text_p
-upon success, and
-.Dv NULL
-upon failure, setting
-.Va errno
-to indicate the error.
-.Pp
-The
-.Fn mac_to_text
-function returns a string
-containing the text representation of
-.Fa label
-upon success, and
-.Dv NULL
-upon failure, setting
-.Va errno
-to indicate the error.
+.Rv -std mac_from_text mac_to_text
.Sh COMPATIBILITY
POSIX.1e does not define
-a text format for text representations
+a format for text representations
of MAC labels.
.Sh ERRORS
.Bl -tag -width Er
-.It Bq Er EINVAL
-An invalid policy or qualifier
-was specified in
-.Fa text_p ,
-or an invalid MAC label
-was specified in
-.Fa label .
.It Bq Er ENOMEM
Insufficient memory was available
to allocate internal storage.
==== //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#9 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.42 2002/11/02 12:05:16 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.43 2002/11/07 14:54:53 nyan Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -275,10 +275,9 @@
break;
case p_pc98:
switch (type) {
+ case fat:
+ case pc98:
case freebsd:
- subtype = 0xc494;
- /* FALLTHROUGH */
- case fat:
c1 = Find_Mother_Chunk(d->chunks, offset, end, whole);
break;
case part:
==== //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#16 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.102 2002/11/03 01:37:08 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.105 2002/11/08 15:25:15 nyan Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -24,7 +24,6 @@
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
-#include <sys/diskmbr.h>
#include <sys/uuid.h>
#include <sys/gpt.h>
#include <paths.h>
@@ -35,7 +34,6 @@
#include <assert.h>
#include <uuid.h>
-#define DOSPTYP_EXTENDED 5
#ifdef DEBUG
#define DPRINT(x) warn x
#define DPRINTX(x) warnx x
@@ -253,7 +251,6 @@
}
if (platform == p_alpha && !strcmp(t, "BSD") &&
d->chunks->part->part == NULL) {
- o = d->chunks->size;
if (Add_Chunk(d, 0, d->chunks->size, name, freebsd, 0, 0, "-"))
DPRINT(("Failed to add 'freebsd' chunk"));
}
@@ -268,15 +265,42 @@
printf("%s [%s] %jd %jd\n", t, n, (intmax_t)(off / s), (intmax_t) (len / s));
if (!strcmp(t, "SUN"))
i = Add_Chunk(d, off, len, n, part, 0, 0, 0);
- else if (!strncmp(t, "MBR", 3) && ty == 165)
- i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0);
- else if (!strncmp(t, "MBR", 3))
- i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0);
- else if (!strcmp(t, "BSD"))
+ else if (!strncmp(t, "MBR", 3)) {
+ switch (ty) {
+ case 0xa5:
+ i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0);
+ break;
+ case 0x01:
+ case 0x04:
+ case 0x06:
+ case 0x0b:
+ case 0x0c:
+ case 0x0e:
+ i = Add_Chunk(d, off, len, n, fat, ty, 0, 0);
+ break;
+ default:
+ i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0);
+ break;
+ }
+ } else if (!strcmp(t, "BSD"))
i = Add_Chunk(d, off, len, n, part, 0, 0, 0);
- else if (!strcmp(t, "PC98"))
- i = Add_Chunk(d, off, len, n, pc98, 0, 0, 0);
- else if (!strcmp(t, "GPT"))
+ else if (!strcmp(t, "PC98")) {
+ switch (ty & 0x7f) {
+ case 0x14:
+ i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0);
+ break;
+ case 0x20:
+ case 0x21:
+ case 0x22:
+ case 0x23:
+ case 0x24:
+ i = Add_Chunk(d, off, len, n, fat, ty, 0, 0);
+ break;
+ default:
+ i = Add_Chunk(d, off, len, n, pc98, ty, 0, 0);
+ break;
+ }
+ } else if (!strcmp(t, "GPT"))
i = Add_Chunk(d, off, len, n, ty, 0, 0, 0);
else
{ printf("BARF %d\n", __LINE__); exit(0); }
@@ -503,15 +527,17 @@
{
switch (type) {
- case 0:
+ case whole:
return "whole";
- case 2:
+ case fat:
return "fat";
- case 3:
+ case freebsd:
switch (subtype) {
case 0xc494: return "freebsd";
default: return "unknown";
}
+ case unused:
+ return "unused";
default:
return "unknown";
}
@@ -522,9 +548,9 @@
{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list