Date: Fri, 18 Oct 2002 12:16:08 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 19570 for review Message-ID: <200210181916.g9IJG8mN072455@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=19570 Change 19570 by rwatson@rwatson_tislabs on 2002/10/18 12:15:19 Integ TrustedBSD base branch as prep for merging to the main tree. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#8 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#10 integrate .. //depot/projects/trustedbsd/base/bin/cp/extern.h#5 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#7 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/util.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#3 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#10 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/su#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/local#4 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#19 integrate .. //depot/projects/trustedbsd/base/include/search.h#6 integrate .. //depot/projects/trustedbsd/base/include/signal.h#8 integrate .. //depot/projects/trustedbsd/base/kerberosIV/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/crypt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/none.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetwc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputwc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/ungetwc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt_long.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/insque.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/insque.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/lsearch.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/lsearch.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/remque.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_info.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_main_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/4.3/insque.3#2 delete .. //depot/projects/trustedbsd/base/lib/libcompat/4.3/insque.c#3 delete .. //depot/projects/trustedbsd/base/lib/libcompat/4.3/lsearch.3#2 delete .. //depot/projects/trustedbsd/base/lib/libcompat/4.3/lsearch.c#3 delete .. //depot/projects/trustedbsd/base/lib/libcompat/4.3/remque.c#3 delete .. //depot/projects/trustedbsd/base/lib/libcompat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/tst01.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.8#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.c#7 integrate .. //depot/projects/trustedbsd/base/release/Makefile#22 integrate .. //depot/projects/trustedbsd/base/release/alpha/fixit_crunch.conf#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#27 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#44 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#10 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#6 integrate .. //depot/projects/trustedbsd/base/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/trustedbsd/base/release/pc98/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/base/release/pc98/fixit_crunch.conf#3 integrate .. //depot/projects/trustedbsd/base/sbin/clri/clri.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/mca/mca.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mac_bsdextended.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/posix4.9#2 delete .. //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#9 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.man.mk#9 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#13 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#6 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/dutch.iso.acc.kbd#1 branch .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#5 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/australasia#5 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#5 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#19 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#39 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/ldscript.ia64#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.alpha#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.ia64#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.x86_64#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdInterrupt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSynch.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_lid.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_powerres.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hea/eni_buffer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hea/eni_vcm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_receive.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/atkbdcreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_freebsd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_enc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#7 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/apm/apm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/smp.h#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/loran.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/rc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spkr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/tw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/i4b_l1dmux.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/itjc/i4b_itjc_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer2/i4b_l2.c#6 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.h#3 integrate .. //depot/projects/trustedbsd/base/sys/isa/pnp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/isa/pnpparse.c#2 integrate .. //depot/projects/trustedbsd/base/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_diskslice.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#27 integrate .. //depot/projects/trustedbsd/base/sys/modules/crypto/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/bridge.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/bsd_comp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.h#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_deflate.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_tty.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_gif.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_gif.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_encap.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/mld6.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/route6.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ah_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/esp.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/esp_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipcomp.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipcomp_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipip_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec6.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_mbuf.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/key.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/key.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/key_debug.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/key_debug.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/key_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/keydb.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/keysock.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/keysock.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/xform.h#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ah.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/xform_esp.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipcomp.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#1 branch .. //depot/projects/trustedbsd/base/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm_proto.c#5 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/spkr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons_pc98.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/amd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_mn.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ti.c#13 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#16 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_acl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extern.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#15 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#7 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#13 integrate .. //depot/projects/trustedbsd/base/tools/tools/commitsdb/make_commit_db#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/catman/catman.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/colldef/colldef.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/colldef/parse.y#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/compress/doc/NOTES#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/compress/doc/README#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/aout.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/arcs.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/dfn.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/elf.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/gprof.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/gprof.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/gprof.h#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/hertz.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/hp300.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/i386.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/lookup.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/mips.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/printgprof.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/printlist.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/sparc.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/sparc64.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/tahoe.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/vax.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/README#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/indent.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/indent_globs.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/lexi.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/parse.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/locale/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.bin/locale/locale.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.access.5#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/nm/nm.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/nm/nm.1aout#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/rlogin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/rlogin/rlogin.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/rlogin/rlogin.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/rpcinfo/rpcinfo.8#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/rsh/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/rsh/rsh.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/symorder/symorder.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tr/tr.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/yacc/yyfix.1#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ac/ac.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/apm/apm.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/apm/apm.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/crunchide.1#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/keyadmin/keyadmin.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/ofw_util.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/ofw_util.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/ofwdump.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/ofwdump.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ofwdump/pathnames.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.8#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.8#1 branch Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.47 2002/09/01 15:55:38 rwatson Exp $ +$FreeBSD: src/MAINTAINERS,v 1.48 2002/10/18 18:27:56 njl Exp $ subsystem login notes ----------------------------- @@ -39,6 +39,7 @@ libcam ken Pre-commit review requested. libdevstat ken Pre-commit review requested. iostat(8) ken Pre-commit review requested. +da(4) njl Pre-commit review requested. send to scsi@freebsd.org cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. ==== //depot/projects/trustedbsd/base/bin/cp/cp.c#10 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.42 2002/09/22 11:15:56 mckay Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.43 2002/10/18 14:44:59 markm Exp $"); /* * Cp copies source files to target files. @@ -252,7 +252,7 @@ exit (copy(argv, type, fts_options)); } -int +static int copy(char *argv[], enum op type, int fts_options) { struct stat to_stat; @@ -484,7 +484,7 @@ * parent directory, whereas directories tend not to be. Copying the * files first reduces seeking. */ -int +static int mastercmp(const FTSENT * const *a, const FTSENT * const *b) { int a_info, b_info; ==== //depot/projects/trustedbsd/base/bin/cp/extern.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD: src/bin/cp/extern.h,v 1.15 2002/07/23 00:42:56 johan Exp $ + * $FreeBSD: src/bin/cp/extern.h,v 1.16 2002/10/18 14:44:59 markm Exp $ */ typedef struct { @@ -45,8 +45,8 @@ __BEGIN_DECLS int copy_fifo(struct stat *, int); -int copy_file(FTSENT *, int); -int copy_link(FTSENT *, int); +int copy_file(const FTSENT *, int); +int copy_link(const FTSENT *, int); int copy_special(struct stat *, int); int setfile(struct stat *, int); void usage(void); ==== //depot/projects/trustedbsd/base/bin/cp/utils.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.38 2002/07/31 16:52:16 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.39 2002/10/18 14:45:00 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -58,7 +58,7 @@ #include "extern.h" int -copy_file(FTSENT *entp, int dne) +copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; @@ -193,7 +193,7 @@ } int -copy_link(FTSENT *p, int exists) +copy_link(const FTSENT *p, int exists) { int len; char llink[PATH_MAX]; ==== //depot/projects/trustedbsd/base/bin/date/date.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.41 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.42 2002/10/18 14:48:48 markm Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -65,7 +65,7 @@ #define TM_YEAR_BASE 1900 #endif -time_t tval; +static time_t tval; int retval; static void setthetime(const char *, const char *, int, int); @@ -179,7 +179,7 @@ #define ATOI2(s) ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0')) -void +static void setthetime(const char *fmt, const char *p, int jflag, int nflag) { struct tm *lt; ==== //depot/projects/trustedbsd/base/bin/ls/extern.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.19 2002/05/19 02:51:36 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -45,6 +45,7 @@ void printcol(DISPLAY *); void printlong(DISPLAY *); +int printname(const char *); void printscol(DISPLAY *); void printstream(DISPLAY *); void usage(void); ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#11 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.66 2002/09/21 01:28:36 wollman Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.67 2002/10/18 10:59:45 tjr Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -470,10 +470,13 @@ * a separator. If multiple arguments, precede each * directory with its name. */ - if (output) - (void)printf("\n%s:\n", p->fts_path); - else if (argc > 1) { - (void)printf("%s:\n", p->fts_path); + if (output) { + putchar('\n'); + printname(p->fts_path); + puts(":"); + } else if (argc > 1) { + printname(p->fts_path); + puts(":"); output = 1; } chp = fts_children(ftsp, ch_options); ==== //depot/projects/trustedbsd/base/bin/ls/print.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.57 2002/08/29 14:29:09 keramida Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.59 2002/10/18 10:59:45 tjr Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -93,7 +93,7 @@ typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -static unit_t unit_adjust(off_t *); +static unit_t unit_adjust(double *); static int unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; @@ -141,7 +141,7 @@ /* * print name in current style */ -static int +int printname(const char *name) { if (f_octal || f_octal_escape) @@ -602,16 +602,18 @@ static void printsize(size_t width, off_t bytes) { + double dbytes; unit_t unit; if (f_humanval) { - unit = unit_adjust(&bytes); + dbytes = bytes; + unit = unit_adjust(&dbytes); - if (bytes == 0) + if (dbytes == 0) (void)printf("%*s ", width, "0B"); else - (void)printf("%*lld%c ", width - 1, bytes, - "BKMGTPE"[unit]); + (void)printf("%*.*f%c ", width - 1, dbytes > 10 ? 0 : 1, + dbytes, "BKMGTPE"[unit]); } else (void)printf("%*lld ", width, bytes); } @@ -623,13 +625,13 @@ * */ unit_t -unit_adjust(off_t *val) +unit_adjust(double *val) { double abval; unit_t unit; unsigned int unit_sz; - abval = fabs((double)*val); + abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; ==== //depot/projects/trustedbsd/base/bin/rcp/Makefile#6 (text+ko) ==== @@ -1,24 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/bin/rcp/Makefile,v 1.21 2002/10/06 03:50:06 tjr Exp $ +# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $ PROG= rcp SRCS= rcp.c util.c CFLAGS+=-DBINDIR=${BINDIR} -.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) -SRCS+= krcmd.c kcmd.c rcmd_util.c -DPADD= ${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} -CFLAGS+=-DCRYPT -DHAVE_CONFIG_H \ - -I${.CURDIR}/../../kerberosIV/include \ - -I${.CURDIR}/../../crypto/kerberosIV/include \ - -I${.CURDIR}/../../crypto/kerberosIV/lib/roken \ - -I${.CURDIR}/../../crypto/kerberosIV/appl/bsd \ - -I${.CURDIR} -LDADD= -lutil -lkrb -lcrypto -DISTRIBUTION= krb4 -.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd -.endif - BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg ==== //depot/projects/trustedbsd/base/bin/rcp/rcp.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.38 2002/10/06 11:14:21 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.39 2002/10/16 16:06:46 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -81,26 +81,7 @@ #include "extern.h" -#ifdef KERBEROS -#include <openssl/des.h> -#include <krb.h> -#include "bsd_locl.h" - -char dst_realm_buf[REALM_SZ]; -char *dest_realm = NULL; -int use_kerberos = 1; -CREDENTIALS cred; -Key_schedule schedule; -extern char *krb_realmofhost(); -#ifdef CRYPT -int doencrypt = 0; -#define OPTIONS "46dfKk:prtx" -#else -#define OPTIONS "46dfKk:prt" -#endif -#else #define OPTIONS "46dfprt" -#endif struct passwd *pwd; u_short port; @@ -115,10 +96,6 @@ #define CMDNEEDS 64 char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ -#ifdef KERBEROS -int kerberos(char **, char *, char *, char *); -void oldw(const char *, ...) __printflike(1, 2); -#endif int response(void); void rsource(char *, struct stat *); void run_err(const char *, ...) __printflike(1, 2); @@ -134,9 +111,6 @@ struct servent *sp; int ch, fflag, i, tflag; char *targ, *shell; -#ifdef KERBEROS - char *k; -#endif /* * Prepare for execing ourselves. @@ -165,24 +139,6 @@ family = PF_INET6; break; - case 'K': -#ifdef KERBEROS - use_kerberos = 0; -#endif - break; -#ifdef KERBEROS - case 'k': - dest_realm = dst_realm_buf; - (void)strncpy(dst_realm_buf, optarg, REALM_SZ - 1); - dst_realm_buf[REALM_SZ - 1] = '\0'; - break; -#ifdef CRYPT - case 'x': - doencrypt = 1; - /* des_set_key(cred.session, schedule); */ - break; -#endif -#endif case 'p': pflag = 1; break; @@ -208,26 +164,7 @@ argc -= optind; argv += optind; -#ifdef KERBEROS - k = auth_getval("auth_list"); - if (k && !strstr(k, "kerberos")) - use_kerberos = 0; - if (use_kerberos) { -#ifdef CRYPT - shell = doencrypt ? "ekshell" : "kshell"; -#else - shell = "kshell"; -#endif - if ((sp = getservbyname(shell, "tcp")) == NULL) { - use_kerberos = 0; - oldw("can't get entry for %s/tcp service", shell); - sp = getservbyname(shell = "shell", "tcp"); - } - } else - sp = getservbyname(shell = "shell", "tcp"); -#else sp = getservbyname(shell = "shell", "tcp"); -#endif if (sp == NULL) errx(1, "%s/tcp: unknown service", shell); port = sp->s_port; @@ -257,20 +194,9 @@ rem = -1; /* Command to be executed on remote system using "rsh". */ -#ifdef KERBEROS - (void)snprintf(cmd, sizeof(cmd), - "rcp%s%s%s%s", iamrecursive ? " -r" : "", -#ifdef CRYPT - (doencrypt && use_kerberos ? " -x" : ""), -#else - "", -#endif - pflag ? " -p" : "", targetshouldbedirectory ? " -d" : ""); -#else (void)snprintf(cmd, sizeof(cmd), "rcp%s%s%s", iamrecursive ? " -r" : "", pflag ? " -p" : "", targetshouldbedirectory ? " -d" : ""); -#endif (void)signal(SIGPIPE, lostconn); @@ -348,17 +274,10 @@ err(1, "malloc"); (void)snprintf(bp, len, "%s -t %s", cmd, targ); host = thost; -#ifdef KERBEROS - if (use_kerberos) - rem = kerberos(&host, bp, - pwd->pw_name, - tuser ? tuser : pwd->pw_name); - else -#endif - rem = rcmd_af(&host, port, - pwd->pw_name, - tuser ? tuser : pwd->pw_name, - bp, 0, family); + rem = rcmd_af(&host, port, + pwd->pw_name, + tuser ? tuser : pwd->pw_name, + bp, 0, family); if (rem < 0) exit(1); if (family == PF_INET) { @@ -417,12 +336,7 @@ if ((bp = malloc(len)) == NULL) err(1, "malloc"); (void)snprintf(bp, len, "%s -f %s", cmd, src); - rem = -#ifdef KERBEROS - use_kerberos ? - kerberos(&host, bp, pwd->pw_name, suser) : -#endif - rcmd_af(&host, port, pwd->pw_name, suser, bp, 0, + rem = rcmd_af(&host, port, pwd->pw_name, suser, bp, 0, family); (void)free(bp); if (rem < 0) { @@ -814,44 +728,6 @@ exit(1); } -#ifdef KERBEROS -int -kerberos(char **host, char *bp, char *locuser, char *user) -{ - if (use_kerberos) { - setuid(getuid()); - rem = KSUCCESS; - errno = 0; - if (dest_realm == NULL) - dest_realm = krb_realmofhost(*host); - rem = -#ifdef CRYPT - doencrypt ? - krcmd_mutual(host, - port, user, bp, 0, dest_realm, &cred, schedule) : -#endif - krcmd(host, port, user, bp, 0, dest_realm); - - if (rem < 0) { - if (errno == ECONNREFUSED) - oldw("remote host doesn't support Kerberos"); - else if (errno == ENOENT) - oldw("can't provide Kerberos authentication data"); - execv(_PATH_RCP, argv_copy); - err(1, "execv: %s", _PATH_RCP); - } - } else { -#ifdef CRYPT - if (doencrypt) - errx(1, - "the -x option requires Kerberos authentication"); -#endif - rem = rcmd_af(host, port, locuser, user, bp, 0, family); - } - return (rem); -} -#endif /* KERBEROS */ - int response(void) { @@ -888,39 +764,14 @@ void usage(void) { -#ifdef KERBEROS -#ifdef CRYPT - (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-46Kpx] [-k realm] f1 f2", - " rcp [-46Kprx] [-k realm] f1 ... fn directory"); -#else - (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-46Kp] [-k realm] f1 f2", - " rcp [-46Kpr] [-k realm] f1 ... fn directory"); -#endif -#else (void)fprintf(stderr, "%s\n%s\n", "usage: rcp [-46p] f1 f2", " rcp [-46pr] f1 ... fn directory"); -#endif exit(1); } #include <stdarg.h> -#ifdef KERBEROS -void -oldw(const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - (void)fprintf(stderr, "rcp: "); - (void)vfprintf(stderr, fmt, ap); - (void)fprintf(stderr, ", using standard rcp\n"); - va_end(ap); -} -#endif - void run_err(const char *fmt, ...) { ==== //depot/projects/trustedbsd/base/bin/rcp/util.c#5 (text+ko) ==== @@ -33,11 +33,11 @@ #ifndef lint #if 0 -static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94"; #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.15 2002/09/29 07:59:57 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.16 2002/10/16 16:06:46 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#3 (text+ko) ==== @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/mkbuiltins,v 1.10 2002/02/18 06:08:23 imp Exp $ +# $FreeBSD: src/bin/sh/mkbuiltins,v 1.11 2002/10/18 10:33:32 tjr Exp $ temp=`/usr/bin/mktemp -t ka` havejobs=0 @@ -60,7 +60,7 @@ ! awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \ - print $0}' builtins.def | sed 's/-j//' > $temp + print $0}' builtins.def | sed 's/-[hj]//' > $temp awk '{ printf "int %s();\n", $1}' $temp echo ' int (*const builtinfunc[])() = {' ==== //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.10 2002/10/11 12:20:01 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.11 2002/10/18 09:10:44 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -45,4 +45,7 @@ . .\} . +.\" Disable SGR support in grotty(1). +.if n .do nop \X'tty: sgr 0'\c +. .\" Don't let blank lines creep in here. ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#10 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210181916.g9IJG8mN072455>