Date: Sat, 8 Feb 2003 07:27:35 -0800 (PST) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24821 for review Message-ID: <200302081527.h18FRZPA054264@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24821 Change 24821 by tzukanov@tzukanov_antares on 2003/02/08 07:26:43 IFC. Affected files ... .. //depot/projects/s390/MAINTAINERS#7 integrate .. //depot/projects/s390/Makefile.inc1#8 integrate .. //depot/projects/s390/UPDATING#7 integrate .. //depot/projects/s390/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/s390/bin/date/date.c#3 integrate .. //depot/projects/s390/bin/date/netdate.c#2 integrate .. //depot/projects/s390/bin/ps/fmt.c#2 integrate .. //depot/projects/s390/bin/ps/keyword.c#5 integrate .. //depot/projects/s390/bin/ps/nlist.c#3 integrate .. //depot/projects/s390/bin/ps/print.c#5 integrate .. //depot/projects/s390/bin/ps/ps.c#5 integrate .. //depot/projects/s390/bin/rm/rm.1#3 integrate .. //depot/projects/s390/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/s390/bin/sh/sh.1#5 integrate .. //depot/projects/s390/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_findenv.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_get_option.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_impl.h#4 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_restore_cred.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_set_option.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_data.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_item.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_data.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/s390/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/s390/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/s390/crypto/openssh/sshd.8#4 integrate .. //depot/projects/s390/crypto/openssh/version.h#3 integrate .. //depot/projects/s390/etc/defaults/pccard.conf#5 integrate .. //depot/projects/s390/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/s390/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/s390/etc/namedb/named.conf#3 integrate .. //depot/projects/s390/etc/pam.d/sshd#3 integrate .. //depot/projects/s390/etc/pam.d/su#3 integrate .. //depot/projects/s390/etc/rc.devfs#2 integrate .. //depot/projects/s390/etc/rc.firewall#2 integrate .. //depot/projects/s390/etc/rc.firewall6#2 integrate .. //depot/projects/s390/include/Makefile#6 integrate .. //depot/projects/s390/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/s390/lib/libc/db/man/mpool.3#3 integrate .. //depot/projects/s390/lib/libc/gen/glob.3#4 integrate .. //depot/projects/s390/lib/libc/locale/mbrune.3#5 integrate .. //depot/projects/s390/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/s390/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/s390/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_soc.3#3 integrate .. //depot/projects/s390/lib/libc/stdio/tmpfile.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/s390/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fcntl.2#5 integrate .. //depot/projects/s390/lib/libc/sys/nfssvc.2#4 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_attr.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_attr_get_np.3#4 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cancel.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_init.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_signal.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_wait.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_attr_get_np.c#3 integrate .. //depot/projects/s390/lib/libdisk/create_chunk.c#5 integrate .. //depot/projects/s390/lib/libdisk/libdisk.h#5 integrate .. //depot/projects/s390/lib/libdisk/write_alpha_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_disk.c#4 integrate .. //depot/projects/s390/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/s390/lib/libedit/editline.3#3 integrate .. //depot/projects/s390/lib/libipsec/ipsec_set_policy.3#3 integrate .. //depot/projects/s390/lib/libipsec/ipsec_strerror.3#2 integrate .. //depot/projects/s390/lib/libpam/modules/modules.inc#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_echo/pam_echo.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_echo/pam_echo.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_exec/pam_exec.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_exec/pam_exec.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_group/Makefile#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_group/pam_group.8#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_group/pam_group.c#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_kerberosIV/Makefile#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.8#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_krb5/pam_krb5.c#5 integrate .. //depot/projects/s390/lib/libpam/modules/pam_wheel/pam_wheel.c#3 integrate .. //depot/projects/s390/libexec/bootpd/bootpd.c#2 integrate .. //depot/projects/s390/libexec/bootpd/bootpgw/bootpgw.c#2 integrate .. //depot/projects/s390/libexec/bootpd/rtmsg.c#3 integrate .. //depot/projects/s390/libexec/bootpd/tools/bootptest/bootptest.c#2 integrate .. //depot/projects/s390/libexec/ftpd/ftpcmd.y#4 integrate .. //depot/projects/s390/libexec/ftpd/ftpd.c#5 integrate .. //depot/projects/s390/libexec/lukemftpd/Makefile#5 integrate .. //depot/projects/s390/libexec/lukemftpd/pamize.h#1 branch .. //depot/projects/s390/release/Makefile#9 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#6 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate .. //depot/projects/s390/release/i386/drivers.conf#8 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/s390/sbin/mount_nullfs/mount_nullfs.8#4 integrate .. //depot/projects/s390/sbin/natd/natd.c#3 integrate .. //depot/projects/s390/sbin/vinum/vext.h#2 integrate .. //depot/projects/s390/share/examples/etc/make.conf#5 integrate .. //depot/projects/s390/share/man/man4/firewire.4#4 integrate .. //depot/projects/s390/share/man/man4/sbp.4#4 integrate .. //depot/projects/s390/share/man/man4/vinum.4#3 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#7 integrate .. //depot/projects/s390/share/man/man7/hier.7#6 integrate .. //depot/projects/s390/share/man/man9/malloc.9#4 integrate .. //depot/projects/s390/share/man/man9/namei.9#3 integrate .. //depot/projects/s390/share/man/man9/sleep.9#3 integrate .. //depot/projects/s390/sys/alpha/alpha/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/s390/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/s390/sys/alpha/linux/linux.h#2 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/s390/sys/conf/NOTES#8 integrate .. //depot/projects/s390/sys/conf/files#9 integrate .. //depot/projects/s390/sys/conf/files.pc98#5 integrate .. //depot/projects/s390/sys/conf/files.powerpc#5 integrate .. //depot/projects/s390/sys/conf/kmod.mk#6 integrate .. //depot/projects/s390/sys/conf/options#6 integrate .. //depot/projects/s390/sys/conf/options.powerpc#4 integrate .. //depot/projects/s390/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/s390/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/s390/sys/dev/aac/aac.c#6 integrate .. //depot/projects/s390/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/s390/sys/dev/aac/aac_cam.h#2 delete .. //depot/projects/s390/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/s390/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/s390/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/s390/sys/dev/aha/aha.c#4 integrate .. //depot/projects/s390/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/s390/sys/dev/an/if_an.c#6 integrate .. //depot/projects/s390/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/s390/sys/dev/an/if_anreg.h#4 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/s390/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/s390/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/s390/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/s390/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/s390/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/s390/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/s390/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/s390/sys/dev/ida/ida_disk.c#3 integrate .. //depot/projects/s390/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/s390/sys/dev/mly/mly.c#7 integrate .. //depot/projects/s390/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/s390/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/s390/sys/dev/random/harvest.c#2 integrate .. //depot/projects/s390/sys/dev/sio/sio.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/s390/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/sbc.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/sndbuf_dma.c#1 branch .. //depot/projects/s390/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/s390/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/s390/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsecvar.h#3 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#7 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/s390/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/s390/sys/dev/vinum/vinumhdr.h#2 integrate .. //depot/projects/s390/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs.h#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/s390/sys/geom/geom.h#7 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#8 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#8 integrate .. //depot/projects/s390/sys/geom/geom_dump.c#6 integrate .. //depot/projects/s390/sys/geom/geom_enc.c#5 integrate .. //depot/projects/s390/sys/geom/geom_int.h#4 integrate .. //depot/projects/s390/sys/geom/geom_io.c#8 integrate .. //depot/projects/s390/sys/geom/geom_kern.c#6 integrate .. //depot/projects/s390/sys/geom/geom_stats.c#1 branch .. //depot/projects/s390/sys/geom/geom_stats.h#1 branch .. //depot/projects/s390/sys/geom/geom_subr.c#8 integrate .. //depot/projects/s390/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/s390/sys/geom/notes#1 branch .. //depot/projects/s390/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/i386/i386/critical.c#3 integrate .. //depot/projects/s390/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/s390/sys/i386/i386/tsc.c#1 branch .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/s390/sys/i386/include/clock.h#3 integrate .. //depot/projects/s390/sys/i386/include/cpu.h#2 integrate .. //depot/projects/s390/sys/i386/include/smp.h#4 integrate .. //depot/projects/s390/sys/i386/isa/apic_vector.s#3 integrate .. //depot/projects/s390/sys/i386/isa/clock.c#6 integrate .. //depot/projects/s390/sys/i386/isa/gpib.c#4 integrate .. //depot/projects/s390/sys/i386/isa/gsc.c#2 integrate .. //depot/projects/s390/sys/i386/isa/tw.c#3 integrate .. //depot/projects/s390/sys/i386/linux/linux.h#2 integrate .. //depot/projects/s390/sys/i4b/driver/i4b_isppp.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/s390/sys/ia64/ia64/sscdisk.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/swtch.s#4 integrate .. //depot/projects/s390/sys/isa/isareg.h#2 integrate .. //depot/projects/s390/sys/kern/init_main.c#7 integrate .. //depot/projects/s390/sys/kern/kern_clock.c#6 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#5 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#8 integrate .. //depot/projects/s390/sys/kern/kern_lock.c#6 integrate .. //depot/projects/s390/sys/kern/kern_time.c#7 integrate .. //depot/projects/s390/sys/kern/sched_ule.c#2 integrate .. //depot/projects/s390/sys/kern/subr_clock.c#3 integrate .. //depot/projects/s390/sys/kern/subr_prf.c#7 integrate .. //depot/projects/s390/sys/kern/subr_prof.c#5 integrate .. //depot/projects/s390/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/s390/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/s390/sys/libkern/random.c#2 integrate .. //depot/projects/s390/sys/modules/Makefile#8 integrate .. //depot/projects/s390/sys/modules/canbepm/Makefile#1 branch .. //depot/projects/s390/sys/modules/canbus/Makefile#1 branch .. //depot/projects/s390/sys/modules/linux/Makefile#3 integrate .. //depot/projects/s390/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/als4000/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/cs4281/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/csa/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/driver/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/ds1/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/es137x/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/fm801/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/ich/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/maestro/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/maestro3/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/neomagic/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/solo/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/t4dwave/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/uaudio/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/via8233/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/via82c686/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/vibes/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/pcm/Makefile#3 integrate .. //depot/projects/s390/sys/net/if_ppp.c#5 integrate .. //depot/projects/s390/sys/net/radix.c#5 integrate .. //depot/projects/s390/sys/net/radix.h#5 integrate .. //depot/projects/s390/sys/net/zlib.c#3 integrate .. //depot/projects/s390/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/s390/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#5 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/s390/sys/netinet6/nd6.c#4 integrate .. //depot/projects/s390/sys/netipsec/key.c#4 integrate .. //depot/projects/s390/sys/netkey/key.c#4 integrate .. //depot/projects/s390/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/pc98/pc98/canbepm.c#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus.c#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus.h#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus_if.m#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbusvars.h#1 branch .. //depot/projects/s390/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/s390/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/s390/sys/pccard/pccard.c#4 integrate .. //depot/projects/s390/sys/pci/if_dc.c#7 integrate .. //depot/projects/s390/sys/pci/if_pcn.c#5 integrate .. //depot/projects/s390/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/s390/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/s390/sys/powerpc/include/hid.h#1 branch .. //depot/projects/s390/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/s390/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/s390/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/s390/sys/powerpc/powermac/pswitch.c#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/s390/sys/powerpc/powerpc/cpu.c#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/s390/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/s390/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/s390/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/s390/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/s390/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/s390/sys/sys/bio.h#4 integrate .. //depot/projects/s390/sys/sys/buf.h#5 integrate .. //depot/projects/s390/sys/sys/conf.h#7 integrate .. //depot/projects/s390/sys/sys/disk.h#4 integrate .. //depot/projects/s390/sys/sys/event.h#2 integrate .. //depot/projects/s390/sys/sys/kernel.h#3 integrate .. //depot/projects/s390/sys/sys/lockmgr.h#5 integrate .. //depot/projects/s390/sys/sys/param.h#7 integrate .. //depot/projects/s390/sys/sys/proc.h#9 integrate .. //depot/projects/s390/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/s390/sys/sys/systm.h#5 integrate .. //depot/projects/s390/sys/sys/unpcb.h#3 integrate .. //depot/projects/s390/sys/sys/vmmeter.h#2 integrate .. //depot/projects/s390/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/s390/sys/vm/uma_core.c#6 integrate .. //depot/projects/s390/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/s390/tools/KSE/ksetest/simplelock.h#3 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/Makefile#2 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/test-fpclassify.c#1 branch .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/s390/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/s390/usr.bin/elfdump/elfdump.1#1 branch .. //depot/projects/s390/usr.bin/elfdump/elfdump.c#2 integrate .. //depot/projects/s390/usr.bin/gprof/PSD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/s390/usr.bin/killall/killall.c#2 integrate .. //depot/projects/s390/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/s390/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/s390/usr.bin/mail/USD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/make/PSD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/msgs/msgs.c#3 integrate .. //depot/projects/s390/usr.bin/su/su.c#5 integrate .. //depot/projects/s390/usr.bin/yacc/skeleton.c#2 integrate .. //depot/projects/s390/usr.sbin/Makefile#7 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/s390/usr.sbin/btxld/a.out.h#1 branch .. //depot/projects/s390/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/s390/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/s390/usr.sbin/kgzip/elfhdr.h#2 integrate .. //depot/projects/s390/usr.sbin/kgzip/kgzcmp.c#2 integrate .. //depot/projects/s390/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/s390/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/sign/x509.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/config.c#5 integrate .. //depot/projects/s390/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/s390/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.56 2003/01/30 17:39:26 gordon Exp $ +$FreeBSD: src/MAINTAINERS,v 1.57 2003/02/04 06:29:03 phk Exp $ subsystem login notes ----------------------------- @@ -26,13 +26,6 @@ cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -geom phk Pre-commit review requested. -specinfo/dev_t phk Pre-commit review requested. -struct disk phk Pre-commit review requested. -specfs phk Pre-commit review requested. -devfs phk Pre-commit review requested. -timekeeping phk Pre-commit review requested. -md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested udf scottl Pre-commit review with myself or asmodai requested. powerpc benno Pre-commit review preferred. ==== //depot/projects/s390/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.316 2003/02/07 07:29:57 jkoshy Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -253,6 +253,14 @@ # success, regardless of how old your existing system is. # _worldtmp: +.if ${.CURDIR:C/[^,]//g} != "" +# The m4 build of sendmail files doesn't like it if ',' is used +# anywhere in the path of it's files. + @echo + @echo "*** Error: path to source tree contains a comma ','" + @echo + @false +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -461,7 +469,7 @@ # buildkernel: .if empty(BUILDKERNELS) - @echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})." + @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; @false .endif .if defined(KERNWARN) @@ -520,6 +528,10 @@ # Install the kernel defined by INSTALLKERNEL # installkernel reinstallkernel: +.if empty(INSTALLKERNEL) + @echo "ERROR: No kernel \"${KERNCONF}\" to install." + @false +.endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} ==== //depot/projects/s390/UPDATING#7 (text+ko) ==== @@ -1071,8 +1071,34 @@ <reboot> - To upgrade from 4.x-stable to current - ------------------------------------- + To cross-install current onto a separate partition + -------------------------------------------------- + # In this approach we use a separate partition to hold + # current's root, 'usr', and 'var' directories. A partition + # holding "/", "/usr" and "/var" should be about 2GB in + # size. + + <make sure you have good level 0 dumps> + <boot into -stable> + make buildworld + <maybe newfs current's root partition> + <mount current's root partition on directory ${CURRENT_ROOT}> + make installworld DESTDIR=${CURRENT_ROOT} + make buildkernel KERNCONF=YOUR_KERNEL_HERE + cp /usr/src/sys/${ARCH}/conf/GENERIC.hints \ + ${CURRENT_ROOT}/boot/device.hints # as needed + make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} + cd /usr/src/etc; make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd + cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd + <edit ${CURRENT_ROOT}/etc/fstab to mount "/" from the correct partition> + <reboot into current> + <do a "native" rebuild/install as described in the previous section> + <maybe install compatibility libraries from /usr/src/lib/compat> + <reboot> + + + To upgrade in-place from 4.x-stable to current + ---------------------------------------------- # 5.x uses more space than 4.x. Also, the location of kernel # modules has changed. If you are installing 5.0 onto a 4.x # system, you'll need about 30MB of free disk space on your / @@ -1198,4 +1224,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.239 2003/01/29 07:14:16 phk Exp $ +$FreeBSD: src/UPDATING,v 1.240 2003/02/07 08:26:23 jkoshy Exp $ ==== //depot/projects/s390/bin/date/date.c#3 (text+ko) ==== @@ -37,13 +37,14 @@ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.42 2002/10/18 14:48:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.43 2003/02/05 12:56:40 charnier Exp $"); #include <sys/param.h> #include <sys/time.h> ==== //depot/projects/s390/bin/date/netdate.c#2 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)netdate.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.16 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.17 2003/02/05 12:56:40 charnier Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -81,7 +82,7 @@ char hostname[MAXHOSTNAMELEN]; if ((sp = getservbyname("timed", "udp")) == NULL) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return (retval = 2); } ==== //depot/projects/s390/bin/ps/fmt.c#2 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; #endif #endif + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.26 2002/07/05 15:58:26 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.27 2003/02/05 13:18:17 charnier Exp $"); #include <sys/types.h> #include <sys/time.h> ==== //depot/projects/s390/bin/ps/keyword.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.60 2003/01/19 00:31:15 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.62 2003/02/05 19:22:39 sobomax Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -67,6 +67,7 @@ #define PIDLEN 5 #define USERLEN (MAXLOGNAME - 1) +/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, @@ -84,7 +85,7 @@ {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 9, 0, CHAR, NULL, 0}, + {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -98,6 +99,8 @@ {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, NULL, 0}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0}, + {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, + 0}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -111,8 +114,6 @@ LONG, "ld", 0}, {"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld", 0}, - {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, - 0}, {"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0}, {"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d", ==== //depot/projects/s390/bin/ps/nlist.c#3 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.19 2002/11/01 23:26:20 tmm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.20 2003/02/05 13:18:17 charnier Exp $"); #include <sys/types.h> #include <sys/sysctl.h> ==== //depot/projects/s390/bin/ps/print.c#5 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif /* not lint */ #endif + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.78 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.79 2003/02/05 13:18:17 charnier Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -539,14 +540,30 @@ elapsed(KINFO *k, VARENT *ve) { VAR *v; - time_t secs; + time_t days, hours, mins, secs; char obuff[128]; v = ve->var; secs = now - k->ki_p->ki_start.tv_sec; - (void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld", (long)secs/60, - (long)secs%60); + days = secs/(24*60*60); + secs %= (24*60*60); + hours = secs/(60*60); + secs %= (60*60); + mins = secs/60; + secs %= 60; + if (days != 0) { + (void)snprintf(obuff, sizeof(obuff), "%3ld-%02ld:%02ld:%02ld", + (long)days, (long)hours, (long)mins, (long)secs); + } + else if (hours != 0) { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld:%02ld", + (long)hours, (long)mins, (long)secs); + } + else { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld", + (long)mins, (long)secs); + } (void)printf("%*s", v->width, obuff); } ==== //depot/projects/s390/bin/ps/ps.c#5 (text+ko) ==== @@ -42,8 +42,9 @@ static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.61 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.62 2003/02/05 13:18:17 charnier Exp $"); #include <sys/param.h> #include <sys/user.h> ==== //depot/projects/s390/bin/rm/rm.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.26 2002/08/21 17:32:42 trhodes Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.27 2003/02/04 20:38:51 trhodes Exp $ .\" .Dd January 28, 1999 .Dt RM 1 @@ -158,6 +158,7 @@ .Dl rm /home/user/-filename .Dl rm ./-filename .Sh SEE ALSO +.Xr chflags 1 , .Xr rmdir 1 , .Xr undelete 2 , .Xr unlink 2 , ==== //depot/projects/s390/bin/sh/bltin/echo.c#3 (text+ko) ==== @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)echo.c 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.12 2002/12/22 21:35:14 dwmalone Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.13 2003/02/05 13:23:46 charnier Exp $"); + /* * Echo command. */ ==== //depot/projects/s390/bin/sh/sh.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.83 2002/12/24 13:41:45 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.84 2003/02/03 23:03:05 fanf Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1076,10 +1076,12 @@ or null, null is substituted; otherwise, the expansion of word is substituted. +.El .Pp In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Bl -tag -width indent .It Li ${#parameter} String Length. The length in characters of the value of parameter. ==== //depot/projects/s390/contrib/lukemftpd/src/cmds.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $ */ +/* $NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $ */ /* * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -171,6 +171,8 @@ #define FACTTABSIZE (sizeof(facttab) / sizeof(struct ftpfact)) +static char cached_path[MAXPATHLEN + 1] = "/"; +static void discover_path(char *, const char *); void cwd(const char *path) @@ -181,6 +183,9 @@ else { show_chdir_messages(250); ack("CWD"); + if (getcwd(cached_path, MAXPATHLEN) == NULL) { + discover_path(cached_path, path); + } } } @@ -404,11 +409,15 @@ { char path[MAXPATHLEN]; - if (getcwd(path, sizeof(path) - 1) == NULL) - reply(550, "Can't get the current directory: %s.", - strerror(errno)); - else - replydirname(path, "is the current directory."); + if (getcwd(path, sizeof(path) - 1) == NULL) { + if (chdir(cached_path) < 0) { + reply(550, "Can't get the current directory: %s.", + strerror(errno)); + return; + } + (void)strlcpy(path, cached_path, MAXPATHLEN); + } + replydirname(path, "is the current directory."); } void @@ -844,3 +853,126 @@ *p = '\0'; reply(257, "\"%s\" %s", npath, message); } + +static void +discover_path(last_path, new_path) + char *last_path; + const char *new_path; +{ + char tp[MAXPATHLEN + 1] = ""; + char tq[MAXPATHLEN + 1] = ""; + char *cp; + char *cq; + int sz1, sz2; + int nomorelink; + struct stat st1, st2; + + if (new_path[0] != '/') { + (void)strlcpy(tp, last_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + } + (void)strlcat(tp, new_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + + /* + * resolve symlinks. A symlink may introduce another symlink, so we + * loop trying to resolve symlinks until we don't find any of them. + */ + do { + /* Collapse any // into / */ + while ((cp = strstr(tp, "//")) != NULL) + (void)memmove(cp, cp + 1, strlen(cp) - 1 + 1); + + /* Collapse any /./ into / */ + while ((cp = strstr(tp, "/./")) != NULL) + (void)memmove(cp, cp + 2, strlen(cp) - 2 + 1); + + cp = tp; + nomorelink = 1; + + while ((cp = strstr(++cp, "/")) != NULL) { + sz1 = (u_long)cp - (u_long)tp; + if (sz1 > MAXPATHLEN) + goto bad; + *cp = 0; + sz2 = readlink(tp, tq, MAXPATHLEN); + *cp = '/'; + + /* If this is not a symlink, move to next / */ + if (sz2 <= 0) + continue; + + /* + * We found a symlink, so we will have to + * do one more pass to check there is no + * more symlink in the path + */ + nomorelink = 0; + + /* + * Null terminate the string and remove trailing / + */ + tq[sz2] = 0; + sz2 = strlen(tq); + if (tq[sz2 - 1] == '/') + tq[--sz2] = 0; + + /* + * Is this an absolute link or a relative link? + */ + if (tq[0] == '/') { + /* absolute link */ + if (strlen(cp) + sz2 > MAXPATHLEN) + goto bad; + memmove(tp + sz2, cp, strlen(cp) + 1); + memcpy(tp, tq, sz2); + } else { + /* relative link */ + for (cq = cp - 1; *cq != '/'; cq--); + if (strlen(tp) - ((u_long)cq - (u_long)cp) + + 1 + sz2 > MAXPATHLEN) + goto bad; + (void)memmove(cq + 1 + sz2, + cp, strlen(cp) + 1); + (void)memcpy(cq + 1, tq, sz2); + } + + /* + * start over, looking for new symlinks + */ + break; + } + } while (nomorelink == 0); + + /* Collapse any /foo/../ into /foo/ */ + while ((cp = strstr(tp, "/../")) != NULL) { + /* ^/../foo/ becomes ^/foo/ */ + if (cp == tp) { + (void)memmove(cp, cp + 3, + strlen(cp) - 3 + 1); + } else { + for (cq = cp - 1; *cq != '/'; cq--); + (void)memmove(cq, cp + 3, + strlen(cp) - 3 + 1); + } + } + + /* strip strailing / */ + if (strlen(tp) != 1) + tp[strlen(tp) - 1] = '\0'; + + /* check that the path is correct */ + stat(tp, &st1); + stat(".", &st2); + if ((st1.st_dev != st2.st_dev) || (st1.st_ino != st2.st_ino)) + goto bad; + + (void)strlcpy(last_path, tp, MAXPATHLEN); + return; + +bad: + (void)strlcat(last_path, "/", MAXPATHLEN); + (void)strlcat(last_path, new_path, MAXPATHLEN); + return; +} + ==== //depot/projects/s390/contrib/lukemftpd/src/ftpcmd.y#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $ */ /*- * Copyright (c) 1997-2002 The NetBSD Foundation, Inc. @@ -83,7 +83,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $"); #endif #endif /* not lint */ @@ -1222,7 +1222,7 @@ { "SMNT", SMNT, ARGS, 0, "(structure mount)" }, { "QUIT", QUIT, NOARGS, 1, "(terminate service)" }, { "REIN", REIN, NOARGS, 0, "(reinitialize server state)" }, - { "PORT", PORT, ARGS, 1, "<sp> b0, b1, b2, b3, b4" }, + { "PORT", PORT, ARGS, 1, "<sp> b0, b1, b2, b3, b4, b5" }, { "LPRT", LPRT, ARGS, 1, "<sp> af, hal, h1, h2, h3,..., pal, p1, p2..." }, { "EPRT", EPRT, STR1, 1, "<sp> |af|addr|port|" }, { "PASV", PASV, NOARGS, 1, "(set server in passive mode)" }, ==== //depot/projects/s390/contrib/lukemftpd/src/ftpd.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $ */ /* * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. @@ -109,10 +109,10 @@ #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $"); #endif #endif /* not lint */ -__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.2 2003/01/07 17:31:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.3 2003/02/02 21:03:28 obrien Exp $"); /* * FTP server. @@ -686,8 +686,7 @@ } else pw = sgetpwnam(name); - if (logging) - strlcpy(curname, name, sizeof(curname)); + strlcpy(curname, name, sizeof(curname)); /* check user in /etc/ftpusers, and setup class */ permitted = checkuser(_PATH_FTPUSERS, curname, 1, 0, &class); @@ -1650,7 +1649,7 @@ { char sizebuf[32]; FILE *file; >>> 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?200302081527.h18FRZPA054264>