Date: Sun, 28 Nov 2004 02:11:54 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 65959 for review Message-ID: <200411280211.iAS2BsFf068400@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=65959 Change 65959 by peter@peter_overcee on 2004/11/28 02:11:48 IFC @65958 Affected files ... .. //depot/projects/hammer/Makefile.inc1#77 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#11 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#43 integrate .. //depot/projects/hammer/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/hammer/etc/periodic/security/Makefile#3 integrate .. //depot/projects/hammer/etc/rc.d/jail#11 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#31 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/divrem.m4#2 integrate .. //depot/projects/hammer/lib/libc/regex/engine.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#12 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#7 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_jmp.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#21 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#3 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#22 integrate .. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_machdep.h#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#17 integrate .. //depot/projects/hammer/sbin/gvinum/gvinum.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#34 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#5 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#4 integrate .. //depot/projects/hammer/sbin/mount_ufs/Makefile#1 branch .. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#1 branch .. //depot/projects/hammer/sbin/swapon/swapon.c#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#57 integrate .. //depot/projects/hammer/share/man/man4/altq.4#4 integrate .. //depot/projects/hammer/share/man/man4/amr.4#8 integrate .. //depot/projects/hammer/share/man/man4/dc.4#14 integrate .. //depot/projects/hammer/share/man/man4/em.4#6 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#9 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#9 integrate .. //depot/projects/hammer/share/man/man4/nge.4#5 integrate .. //depot/projects/hammer/share/man/man4/re.4#12 integrate .. //depot/projects/hammer/share/man/man4/rl.4#12 integrate .. //depot/projects/hammer/share/man/man4/sf.4#4 integrate .. //depot/projects/hammer/share/man/man4/sis.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#1 branch .. //depot/projects/hammer/share/man/man4/ste.4#8 integrate .. //depot/projects/hammer/share/man/man4/vge.4#3 integrate .. //depot/projects/hammer/share/man/man4/vr.4#8 integrate .. //depot/projects/hammer/share/man/man4/witness.4#4 integrate .. //depot/projects/hammer/share/man/man5/core.5#3 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#44 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/fp_emulate.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#17 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#28 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#10 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#13 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#108 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#117 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#53 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/hammer/sys/arm/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_bus_i80321.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/hammer/sys/boot/Makefile#14 integrate .. //depot/projects/hammer/sys/boot/efi/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 delete .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/start.S#4 delete .. //depot/projects/hammer/sys/boot/efi/libefi/copy.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/loader/Makefile#5 delete .. //depot/projects/hammer/sys/boot/efi/loader/conf.c#4 delete .. //depot/projects/hammer/sys/boot/efi/loader/main.c#7 delete .. //depot/projects/hammer/sys/boot/efi/loader/version#3 delete .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/hammer/sys/boot/ia64/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/version#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/hammer/sys/conf/files#94 integrate .. //depot/projects/hammer/sys/conf/files.alpha#18 integrate .. //depot/projects/hammer/sys/conf/files.amd64#60 integrate .. //depot/projects/hammer/sys/conf/files.arm#2 integrate .. //depot/projects/hammer/sys/conf/files.i386#45 integrate .. //depot/projects/hammer/sys/conf/files.ia64#24 integrate .. //depot/projects/hammer/sys/conf/files.pc98#36 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#11 integrate .. //depot/projects/hammer/sys/ddb/db_run.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#27 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcibvar.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#39 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#22 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#24 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#15 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/hammer/sys/dev/ic/ns16550.h#5 integrate .. //depot/projects/hammer/sys/dev/ic/sab82532.h#1 branch .. //depot/projects/hammer/sys/dev/ic/z8530.h#1 branch .. //depot/projects/hammer/sys/dev/mii/mii.c#9 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_disk.c#8 integrate .. //depot/projects/hammer/sys/dev/mlx/mlxreg.h#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.c#4 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.h#2 delete .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#11 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.h#5 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#44 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#34 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#22 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#45 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#30 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/ia64/include/pte.h#4 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#11 integrate .. //depot/projects/hammer/sys/kern/init_main.c#31 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#72 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#25 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#19 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#36 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#40 integrate .. //depot/projects/hammer/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sio/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#8 integrate .. //depot/projects/hammer/sys/net/if.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_fsm.h#3 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#40 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#22 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#38 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/fpu.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#30 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#35 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rwindow.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/sys/jail.h#6 integrate .. //depot/projects/hammer/sys/sys/mount.h#25 integrate .. //depot/projects/hammer/sys/sys/user.h#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#7 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#37 integrate .. //depot/projects/hammer/tools/lib32/README#2 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#7 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/Makefile#6 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.c#3 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.t#2 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.c#3 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#11 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2B.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2j.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.australia#5 integrate .. //depot/projects/hammer/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/gcore/aoutcore.c#4 delete .. //depot/projects/hammer/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/make/job.c#13 integrate .. //depot/projects/hammer/usr.bin/make/list.h#3 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsEmpty.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#3 integrate .. //depot/projects/hammer/usr.bin/make/main.c#19 integrate .. //depot/projects/hammer/usr.bin/ncal/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#4 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.c#3 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#10 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#77 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -393,6 +393,12 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.for _t in obj depend all + cd ${.CURDIR}/kerberos5/tools; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} +.endfor +.endif .for _t in obj includes cd ${.CURDIR}/include; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} @@ -413,12 +419,6 @@ cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools .endfor -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) -.for _t in obj depend all - cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} -.endfor -.endif cd ${.CURDIR}; \ ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries .for _t in obj depend all @@ -684,7 +684,7 @@ # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all - cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \ + cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ ${MAKE} -DNO_CPU_CFLAGS ${target} .endfor ==== //depot/projects/hammer/etc/defaults/periodic.conf#11 (text+ko) ==== @@ -10,7 +10,7 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.30 2004/09/23 02:00:51 jkoshy Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.31 2004/11/24 18:41:53 mlaier Exp $ # # What files override these defaults ? @@ -150,6 +150,9 @@ # 510.ipfdenied daily_status_security_ipfdenied_enable="YES" +# 520.pfdenied +daily_status_security_pfdenied_enable="YES" + # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" ==== //depot/projects/hammer/etc/defaults/rc.conf#43 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.231 2004/11/09 21:33:18 keramida Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -497,7 +497,9 @@ #jail_example_devfs_enable="NO" # mount devfs in the jail #jail_example_fdescfs_enable="NO" # mount fdescfs in the jail #jail_example_procfs_enable="NO" # mount procfs in jail +#jail_example_mount_enable="NO" # mount/umount jail's fs #jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail +#jail_example_fstab="" # fstab(5) for mount/umount ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/hammer/etc/periodic/security/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $ FILES= 100.chksetuid \ 200.chkmounts \ @@ -6,6 +6,7 @@ 400.passwdless \ 500.ipfwdenied \ 510.ipfdenied \ + 520.pfdenied \ 550.ipfwlimit \ 600.ip6fwdenied \ 650.ip6fwlimit \ ==== //depot/projects/hammer/etc/rc.d/jail#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.17 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $ # # PROVIDE: jail @@ -45,11 +45,18 @@ eval jail_procfs=\"\$jail_${_j}_procfs_enable\" [ -z "${jail_procfs}" ] && jail_procfs="NO" + eval jail_mount=\"\$jail_${_j}_mount_enable\" + [ -z "${jail_mount}" ] && jail_mount="NO" + # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. + eval jail_fstab=\"\$jail_${_j}_fstab\" + [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" + # Debugging aid # debug "$_j devfs enable: $jail_devfs" debug "$_j fdescfs enable: $jail_fdescfs" debug "$_j procfs enable: $jail_procfs" + debug "$_j mount enable: $jail_mount" debug "$_j hostname: $jail_hostname" debug "$_j ip: $jail_ip" debug "$_j root: $jail_rootdir" @@ -57,6 +64,7 @@ debug "$_j fdescdir: $jail_fdescdir" debug "$_j procdir: $jail_procdir" debug "$_j ruleset: $jail_ruleset" + debug "$_j fstab: $jail_fstab" } # set_sysctl rc_knob mib msg @@ -108,6 +116,10 @@ umount -f ${jail_procdir} >/dev/null 2>&1 fi fi + if checkyesno jail_mount; then + [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist" + umount -a -F "${jail_fstab}" >/dev/null 2>&1 + fi } jail_start() @@ -127,6 +139,13 @@ for _jail in ${jail_list} do init_variables $_jail + if checkyesno jail_mount; then + info "Mounting fstab for jail ${_jail} (${jail_fstab})" + if [ ! -f "${jail_fstab}" ]; then + err 3 "$name: ${jail_fstab} does not exist" + fi + mount -a -F "${jail_fstab}" + fi if checkyesno jail_devfs; then info "Mounting devfs on ${jail_devdir}" devfs_mount_jail "${jail_devdir}" ${jail_ruleset} ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#31 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.146 2004/10/27 20:28:56 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ % -- Gifts for Children -- @@ -1063,6 +1063,10 @@ If you're wearing a shirt that's red. -- Doris Robin and Karen Trimble of The L.A. Filkharmonics % +The Ken Thompson school of thought on expert systems: +there's table lookup, fraud, and grand fraud. + -- Andrew Hume +% THE LESSER-KNOWN PROGRAMMING LANGUAGES #10: SIMPLE SIMPLE is an acronym for Sheer Idiot's Monopurpose Programming Language ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.2 2004/08/15 02:39:20 marcel Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $ .Dd August 1, 2004 .Os .Dt KGDB 1 @@ -31,16 +31,83 @@ .Nd The kernel debugger .Sh SYNOPSIS .Nm -.Op Ar -v -.Op Ar -d crashdir -.Op Ar -c core | -n dumpnr | -r device -.Op Ar kernel [ Ar core ] +.Op Fl a +.Op Fl v +.Op Fl d Ar crashdir +.Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device +.Op Ar kernel Op Ar core .Sh DESCRIPTION The .Nm utility is a debugger based on .Xr gdb 1 that allows debugging of kernel core files. +.Pp +The options are as follows: +.Bl -tag -width ".Fl d Ar crashdir" +.It Fl a +Increase the annotation level. +An annotation level of 1 features the historical +.Fl fullname +option of +.Xr gdb 1 . +This is useful when running +.Nm +in Emacs. +.Fl v +Increase verbosity. +.It Fl d Ar crashdir +Use +.Ar crashdir +instead of the default, +.Pa /var/crash +to locate kernel core dump files in. +The name +.Pa vmcore. +plus the dump number will be appended to determine +the actual dump file name. +.It Fl c Ar core +Explicitly use +.Ar core +as the core dump file. +.It Fl n Ar dumpnr +Use the kernel core dump file numbered +.Ar dumpnr +for debugging. +.It Fl r Ar device +Use +.Ar device +to connect +.Nm +to for a remote debugging session. +.El +.Pp +The +.Fl c , +.Fl n , +and +.Fl r +options are mutually exclusive. +.Pp +Optionally, the name of the kernel symbol file and +the name of the core dump file can be supplied on the +command-line as positional arguments. +If no kernel symbol file name has been given, the +symbol file of the currently running kernel will be +used. +If no core dump file has been specified through either +of the options or the last command-line argument, +.Pa /dev/mem +will be opened to allow debugging the currenlty running +kernel. +.Sh FILES +.Bl -tag -width "Pa /var/crash" +.It Pa /dev/mem +Default memory image to open if no core dump file +has been specified. +.It Pa /var/crash +Default directory to locate kernel core dump files. +.El .Sh SEE ALSO .Xr gdb 1 .Sh HISTORY ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.3 2004/09/03 07:11:42 brooks Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.4 2004/11/22 16:08:19 joerg Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -80,7 +80,7 @@ { fprintf(stderr, - "usage: %s [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n" + "usage: %s [-a] [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n" "\t[kernel [core]]\n", getprogname()); exit(1); } @@ -218,8 +218,11 @@ if (s != NULL) strlcpy(crashdir, s, sizeof(crashdir)); - while ((ch = getopt(argc, argv, "c:d:n:r:v")) != -1) { + while ((ch = getopt(argc, argv, "ac:d:n:r:v")) != -1) { switch (ch) { + case 'a': + annotation_level++; + break; case 'c': /* use given core file. */ if (vmcore != NULL) { warnx("option %c: can only be specified once", ==== //depot/projects/hammer/lib/libc/alpha/gen/divrem.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.3 2000/05/10 19:04:57 obrien Exp $ */ +/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/hammer/lib/libc/regex/engine.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.14 2004/07/12 07:35:59 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.15 2004/11/21 03:14:32 tjr Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -331,7 +331,7 @@ NOTE("false alarm"); /* recycle starting later */ start = m->coldp + XMBRTOWC(NULL, m->coldp, - m->endp - m->coldp, &m->mbs, 0); + stop - m->coldp, &m->mbs, 0); assert(start <= stop); } @@ -807,7 +807,7 @@ if (p == m->endp) c = OUT; else - clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR); + clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR); if (EQ(st, fresh)) coldp = p; @@ -861,7 +861,7 @@ assert(coldp != NULL); m->coldp = coldp; if (ISSET(st, stopst)) - return(p+XMBRTOWC(NULL, p, m->endp - p, &m->mbs, 0)); + return(p+XMBRTOWC(NULL, p, stop - p, &m->mbs, 0)); else return(NULL); } @@ -913,7 +913,7 @@ c = OUT; clen = 0; } else - clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR); + clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR); /* is there an EOL and/or BOL between lastc and c? */ flagch = '\0'; ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.82 2004/01/22 19:15:08 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -52,6 +52,7 @@ #include <setjmp.h> #include <signal.h> #include <stdio.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/time.h> @@ -60,6 +61,10 @@ #include <spinlock.h> #include <ucontext.h> #include <pthread_np.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> /* * Define machine dependent macros to get and set the stack pointer ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include <sys/sysctl.h> #include <sys/time.h> #include <sys/ttycom.h> -#include <sys/user.h> #include <sys/wait.h> #include <sys/mman.h> #include <dirent.h> ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_jmp.c#2 (text+ko) ==== @@ -28,13 +28,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.9 2001/10/10 17:48:43 bde Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $ */ #include <unistd.h> #include <setjmp.h> #include <sys/param.h> -#include <sys/user.h> #include <machine/reg.h> #include <pthread.h> #include "pthread_private.h" ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#3 (text+ko) ==== @@ -24,14 +24,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.5 2002/11/13 18:13:26 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.6 2004/11/27 06:51:31 das Exp $ */ #include "namespace.h" #include <sys/types.h> #include <sys/mman.h> #include <sys/param.h> #include <sys/queue.h> -#include <sys/user.h> #include <stdlib.h> #include <pthread.h> #include "un-namespace.h" ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.18 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include <sys/sysctl.h> #include <sys/time.h> #include <sys/ttycom.h> -#include <sys/user.h> #include <sys/wait.h> #include <sys/mman.h> #include <dirent.h> ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#21 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.42 2004/11/27 06:51:31 das Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,6 +54,7 @@ #include <sys/errno.h> #include <sys/msg.h> #include <sys/time.h> +#include <sys/param.h> #include <sys/queue.h> #include <pthread_np.h> #include <sched.h> @@ -69,6 +70,10 @@ #include <machine/atomic.h> #include <sys/thr.h> #include <sys/umtx.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #if defined(_PTHREADS_INVARIANTS) /* ==== //depot/projects/hammer/lib/libthr/thread/thr_stack.c#3 (text+ko) ==== @@ -24,13 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.4 2004/11/27 06:51:31 das Exp $ */ #include <sys/types.h> #include <sys/mman.h> #include <sys/param.h> #include <sys/queue.h> -#include <sys/user.h> #include <stdlib.h> #include <pthread.h> #include "thr_private.h" ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#22 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.192 2004/11/18 14:15:32 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.197 2004/11/22 11:10:04 yar Exp $"); /* * FTP server. @@ -174,7 +174,7 @@ } *thishost, *firsthost; #endif -char remotehost[MAXHOSTNAMELEN]; +char remotehost[NI_MAXHOST]; char *ident = NULL; static char ttyline[20]; @@ -597,7 +597,8 @@ #ifndef VIRTUAL_HOSTING if ((hostname = malloc(MAXHOSTNAMELEN)) == NULL) fatalerror("Ran out of memory."); - (void) gethostname(hostname, MAXHOSTNAMELEN - 1); + if (gethostname(hostname, MAXHOSTNAMELEN - 1) < 0) + hostname[0] = '\0'; hostname[MAXHOSTNAMELEN - 1] = '\0'; #endif if (hostinfo) @@ -648,7 +649,7 @@ */ if ((hostname = malloc(MAXHOSTNAMELEN)) == NULL) fatalerror("Ran out of memory."); - if (gethostname(hostname, MAXHOSTNAMELEN) < 0) + if (gethostname(hostname, MAXHOSTNAMELEN - 1) < 0) hostname[0] = '\0'; hostname[MAXHOSTNAMELEN - 1] = '\0'; if ((hrp = malloc(sizeof(struct ftphost))) == NULL) @@ -865,7 +866,7 @@ for (hi = hrp->hostinfo; hi != NULL; hi = hi->ai_next) { if (memcmp(su, hi->ai_addr, hi->ai_addrlen) == 0) { thishost = hrp; - break; + goto found; } #ifdef INET6 /* XXX IPv4 mapped IPv6 addr consideraton */ @@ -874,12 +875,13 @@ &((struct sockaddr_in *)hi->ai_addr)->sin_addr, sizeof(struct in_addr)) == 0)) { thishost = hrp; - break; + goto found; } #endif } hrp = hrp->next; } +found: su->su_port = port; /* setup static variables as appropriate */ hostname = thishost->hostname; @@ -1296,13 +1298,9 @@ if (rval == 0) { e = pam_acct_mgmt(pamh, 0); - if (e == PAM_NEW_AUTHTOK_REQD) { - e = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); - if (e != PAM_SUCCESS) { - syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, e)); - rval = 1; - } - } else if (e != PAM_SUCCESS) { + if (e != PAM_SUCCESS) { + syslog(LOG_ERR, "pam_acct_mgmt: %s", + pam_strerror(pamh, e)); rval = 1; } } @@ -1397,11 +1395,12 @@ (void) umask(defumask); #ifdef LOGIN_CAP if ((lc = login_getpwclass(pw)) != NULL) { - char remote_ip[MAXHOSTNAMELEN]; + char remote_ip[NI_MAXHOST]; - getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, + if (getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, remote_ip, sizeof(remote_ip) - 1, NULL, 0, - NI_NUMERICHOST); + NI_NUMERICHOST)) + *remote_ip = 0; remote_ip[sizeof(remote_ip) - 1] = 0; if (!auth_hostok(lc, remotehost, remote_ip)) { syslog(LOG_INFO|LOG_AUTH, @@ -1587,6 +1586,8 @@ syslog(LOG_INFO, "FTP LOGIN FROM %s as %s", remotehost, pw->pw_name); } + if (guest || dochroot) + syslog(LOG_INFO, "session root changed to %s", chrootdir); #ifdef LOGIN_CAP login_close(lc); #endif @@ -1931,11 +1932,16 @@ do { file = getdatasock(mode); if (file == NULL) { - char hostbuf[BUFSIZ], portbuf[BUFSIZ]; - getnameinfo((struct sockaddr *)&data_source, - data_source.su_len, hostbuf, sizeof(hostbuf) - 1, - portbuf, sizeof(portbuf), - NI_NUMERICHOST|NI_NUMERICSERV); + char hostbuf[NI_MAXHOST], portbuf[NI_MAXSERV]; + + if (getnameinfo((struct sockaddr *)&data_source, + data_source.su_len, + hostbuf, sizeof(hostbuf) - 1, + portbuf, sizeof(portbuf) - 1, + NI_NUMERICHOST|NI_NUMERICSERV)) + *hostbuf = *portbuf = 0; + hostbuf[sizeof(hostbuf) - 1] = 0; + portbuf[sizeof(portbuf) - 1] = 0; reply(425, "Can't create data socket (%s,%s): %s.", hostbuf, portbuf, strerror(errno)); return (NULL); @@ -2257,6 +2263,7 @@ printf(" Connected to %s", remotehost); if (!getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, hname, sizeof(hname) - 1, NULL, 0, NI_NUMERICHOST)) { + hname[sizeof(hname) - 1] = 0; if (strcmp(hname, remotehost) != 0) printf(" (%s)", hname); } @@ -2362,6 +2369,7 @@ if (!getnameinfo((struct sockaddr *)&tmp, tmp.su_len, hname, sizeof(hname) - 1, NULL, 0, NI_NUMERICHOST)) { + hname[sizeof(hname) - 1] = 0; printf(" %s |%d|%s|%d|\r\n", ispassive ? "EPSV" : "EPRT", af, hname, htons(tmp.su_port)); @@ -2568,9 +2576,14 @@ static void dolog(struct sockaddr *who) { - int error; + char who_name[NI_MAXHOST]; realhostname_sa(remotehost, sizeof(remotehost) - 1, who, who->sa_len); + remotehost[sizeof(remotehost) - 1] = 0; + if (getnameinfo(who, who->sa_len, + who_name, sizeof(who_name) - 1, NULL, 0, NI_NUMERICHOST)) + *who_name = 0; + who_name[sizeof(who_name) - 1] = 0; #ifdef SETPROCTITLE #ifdef VIRTUAL_HOSTING @@ -2587,19 +2600,12 @@ if (logging) { #ifdef VIRTUAL_HOSTING if (thishost != firsthost) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411280211.iAS2BsFf068400>