Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2003 11:18:24 -0700 (PDT)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 29205 for review
Message-ID:  <200304181818.h3IIIOiv016407@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=29205

Change 29205 by marcel@marcel_pluto1 on 2003/04/18 11:17:57

	IFC @29204

Affected files ...

.. //depot/projects/ia64/Makefile.inc1#56 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#28 integrate
.. //depot/projects/ia64/etc/network.subr#1 branch
.. //depot/projects/ia64/etc/rc.d/Makefile#10 integrate
.. //depot/projects/ia64/etc/rc.d/jail#1 branch
.. //depot/projects/ia64/etc/sendmail/freebsd.mc#8 integrate
.. //depot/projects/ia64/include/Makefile#25 integrate
.. //depot/projects/ia64/include/grp.h#9 integrate
.. //depot/projects/ia64/include/nss.h#1 branch
.. //depot/projects/ia64/include/nsswitch.h#3 integrate
.. //depot/projects/ia64/include/pwd.h#8 integrate
.. //depot/projects/ia64/lib/libc/gen/Makefile.inc#23 integrate
.. //depot/projects/ia64/lib/libc/gen/getgrent.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/getgrent.c#5 integrate
.. //depot/projects/ia64/lib/libc/gen/getpwent.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/getpwent.c#7 integrate
.. //depot/projects/ia64/lib/libc/include/namespace.h#9 integrate
.. //depot/projects/ia64/lib/libc/include/nss_tls.h#1 branch
.. //depot/projects/ia64/lib/libc/include/un-namespace.h#7 integrate
.. //depot/projects/ia64/lib/libc/net/Makefile.inc#6 integrate
.. //depot/projects/ia64/lib/libc/net/nsdispatch.3#5 integrate
.. //depot/projects/ia64/lib/libc/net/nsdispatch.c#6 integrate
.. //depot/projects/ia64/lib/libc/net/nslexer.l#5 integrate
.. //depot/projects/ia64/lib/libc/net/nsparser.y#4 integrate
.. //depot/projects/ia64/lib/libc/net/nss_backends.h#1 branch
.. //depot/projects/ia64/lib/libc/net/nss_compat.c#1 branch
.. //depot/projects/ia64/lib/libc/posix1e/mac.3#8 integrate
.. //depot/projects/ia64/lib/libc/sys/Makefile.inc#14 integrate
.. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#1 branch
.. //depot/projects/ia64/lib/libipsec/pfkey_dump.c#3 integrate
.. //depot/projects/ia64/lib/libncurses/Makefile#13 integrate
.. //depot/projects/ia64/lib/libpthread/Makefile#4 integrate
.. //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_enter_uts.S#3 integrate
.. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_switch.S#4 integrate
.. //depot/projects/ia64/lib/libpthread/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#1 branch
.. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/ia64/lib/libpthread/sys/Makefile.inc#3 integrate
.. //depot/projects/ia64/lib/libpthread/sys/lock.c#1 branch
.. //depot/projects/ia64/lib/libpthread/sys/lock.h#1 branch
.. //depot/projects/ia64/lib/libpthread/sys/thr_error.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#6 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_acl_aclcheck_fd.c#2 delete
.. //depot/projects/ia64/lib/libpthread/thread/thr_aio_suspend.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_get_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_init.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_setguardsize.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_setschedparam.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_setscope.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_autoinit.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_clean.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_close.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_condattr_init.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_creat.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_detach.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_exit.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_fcntl.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_find_thread.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_fork.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_fsync.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_gc.c#2 delete
.. //depot/projects/ia64/lib/libpthread/thread/thr_getschedparam.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_info.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#5 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_join.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#8 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kill.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_main_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_mattr_init.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_msync.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_mutex_prioceiling.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_mutex_protocol.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_nanosleep.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_once.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_open.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_pause.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_poll.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_printf.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_priority_queue.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#5 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_read.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_readv.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_resume_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#4 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_select.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_self.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sem.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_seterrno.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_setschedparam.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#4 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigaction.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigpending.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sleep.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_spec.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_stack.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_switch_np.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_system.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_tcdrain.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_wait.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_wait4.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_waitpid.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_write.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_writev.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_yield.c#2 integrate
.. //depot/projects/ia64/release/Makefile#45 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#42 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#79 integrate
.. //depot/projects/ia64/release/i386/dokern.sh#15 integrate
.. //depot/projects/ia64/release/i386/drivers.conf#16 integrate
.. //depot/projects/ia64/release/pc98/dokern.sh#10 integrate
.. //depot/projects/ia64/sbin/bsdlabel/Makefile#1 branch
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.5#1 branch
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#1 branch
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#1 branch
.. //depot/projects/ia64/sbin/bsdlabel/pathnames.h#1 branch
.. //depot/projects/ia64/sbin/disklabel/disklabel.8#16 integrate
.. //depot/projects/ia64/sbin/gbde/Makefile#5 integrate
.. //depot/projects/ia64/sbin/route/route.c#10 integrate
.. //depot/projects/ia64/sbin/sunlabel/Makefile#2 integrate
.. //depot/projects/ia64/sbin/sunlabel/sunlabel.c#2 integrate
.. //depot/projects/ia64/share/man/Makefile#5 integrate
.. //depot/projects/ia64/share/man/man4/firewire.4#7 integrate
.. //depot/projects/ia64/share/man/man4/fwohci.4#6 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#32 integrate
.. //depot/projects/ia64/share/man/man8/intro.8#7 integrate
.. //depot/projects/ia64/share/misc/iso3166#5 integrate
.. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#7 integrate
.. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#18 integrate
.. //depot/projects/ia64/sys/alpha/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/alpha/include/proc.h#5 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux.h#3 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#7 integrate
.. //depot/projects/ia64/sys/arm/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/boot/alpha/boot1/boot1.c#4 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/arcdisk.c#3 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/devicename.c#2 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/devicename.c#5 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_disk.c#6 integrate
.. //depot/projects/ia64/sys/boot/sparc64/boot1/boot1.c#6 integrate
.. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#16 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#23 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_misc.c#22 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_signal.c#8 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#17 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#7 integrate
.. //depot/projects/ia64/sys/conf/files#73 integrate
.. //depot/projects/ia64/sys/conf/files.alpha#19 integrate
.. //depot/projects/ia64/sys/conf/files.i386#35 integrate
.. //depot/projects/ia64/sys/conf/files.ia64#36 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#28 integrate
.. //depot/projects/ia64/sys/conf/files.sparc64#28 integrate
.. //depot/projects/ia64/sys/dev/asr/asr.c#16 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#10 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.c#26 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bge.c#25 integrate
.. //depot/projects/ia64/sys/dev/em/if_em.c#20 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#23 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.h#9 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire_phy.h#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#15 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#3 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwdev.c#14 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwdma.c#1 branch
.. //depot/projects/ia64/sys/dev/firewire/fwdma.h#1 branch
.. //depot/projects/ia64/sys/dev/firewire/fwmem.c#11 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwmem.h#4 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci.c#21 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#14 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#7 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#7 integrate
.. //depot/projects/ia64/sys/dev/firewire/iec13213.h#3 integrate
.. //depot/projects/ia64/sys/dev/firewire/iec68113.h#4 integrate
.. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#13 integrate
.. //depot/projects/ia64/sys/dev/firewire/if_fwevar.h#3 integrate
.. //depot/projects/ia64/sys/dev/firewire/sbp.c#24 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#27 integrate
.. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#9 integrate
.. //depot/projects/ia64/sys/dev/hea/hea_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/hfa/hfa_pci.c#3 integrate
.. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#6 integrate
.. //depot/projects/ia64/sys/dev/lge/if_lge.c#12 integrate
.. //depot/projects/ia64/sys/dev/mcd/mcd_isa.c#3 integrate
.. //depot/projects/ia64/sys/dev/nge/if_nge.c#20 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs#23 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#23 integrate
.. //depot/projects/ia64/sys/dev/pci/pci.c#19 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_if.m#2 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/ia64/sys/dev/pci/pcivar.h#7 integrate
.. //depot/projects/ia64/sys/dev/pdq/if_fpa.c#5 integrate
.. //depot/projects/ia64/sys/dev/scd/scd_isa.c#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#6 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ich.c#13 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#6 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/via8233.h#3 integrate
.. //depot/projects/ia64/sys/dev/txp/if_txp.c#11 integrate
.. //depot/projects/ia64/sys/dev/wds/wd7000.c#3 integrate
.. //depot/projects/ia64/sys/dev/wl/if_wl.c#9 integrate
.. //depot/projects/ia64/sys/dev/wl/if_wl.h#3 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs.c#6 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#13 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#8 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#10 integrate
.. //depot/projects/ia64/sys/geom/geom_bsd.c#29 integrate
.. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#1 branch
.. //depot/projects/ia64/sys/gnu/dev/sound/pci/emu10k1.h#2 integrate
.. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_entry.c#3 integrate
.. //depot/projects/ia64/sys/i386/i386/genassym.c#15 integrate
.. //depot/projects/ia64/sys/i386/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/i386/isa/bs/bsif.h#3 integrate
.. //depot/projects/ia64/sys/i386/isa/if_le.c#10 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#22 integrate
.. //depot/projects/ia64/sys/i386/svr4/svr4_machdep.c#7 integrate
.. //depot/projects/ia64/sys/ia64/conf/GENERIC#28 integrate
.. //depot/projects/ia64/sys/ia64/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/kern/kern_acct.c#18 integrate
.. //depot/projects/ia64/sys/kern/kern_condvar.c#22 integrate
.. //depot/projects/ia64/sys/kern/kern_context.c#3 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#40 integrate
.. //depot/projects/ia64/sys/kern/kern_fork.c#34 integrate
.. //depot/projects/ia64/sys/kern/kern_idle.c#10 integrate
.. //depot/projects/ia64/sys/kern/kern_intr.c#21 integrate
.. //depot/projects/ia64/sys/kern/kern_jail.c#15 integrate
.. //depot/projects/ia64/sys/kern/kern_kthread.c#7 integrate
.. //depot/projects/ia64/sys/kern/kern_mutex.c#24 integrate
.. //depot/projects/ia64/sys/kern/kern_shutdown.c#18 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#43 integrate
.. //depot/projects/ia64/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#37 integrate
.. //depot/projects/ia64/sys/kern/sched_ule.c#12 integrate
.. //depot/projects/ia64/sys/kern/subr_devstat.c#7 integrate
.. //depot/projects/ia64/sys/kern/subr_disk.c#16 integrate
.. //depot/projects/ia64/sys/kern/subr_prf.c#24 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#27 integrate
.. //depot/projects/ia64/sys/kern/sys_process.c#18 integrate
.. //depot/projects/ia64/sys/kern/tty.c#25 integrate
.. //depot/projects/ia64/sys/kern/vfs_aio.c#31 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#40 integrate
.. //depot/projects/ia64/sys/modules/firewire/Makefile.inc#2 integrate
.. //depot/projects/ia64/sys/modules/firewire/firewire/Makefile#7 integrate
.. //depot/projects/ia64/sys/modules/firewire/fwe/Makefile#3 integrate
.. //depot/projects/ia64/sys/netgraph/ng_message.h#3 integrate
.. //depot/projects/ia64/sys/pc98/pc98/wd.c#10 integrate
.. //depot/projects/ia64/sys/pci/if_dc.c#31 integrate
.. //depot/projects/ia64/sys/pci/if_dcreg.h#10 integrate
.. //depot/projects/ia64/sys/pci/if_pcn.c#14 integrate
.. //depot/projects/ia64/sys/pci/if_rl.c#29 integrate
.. //depot/projects/ia64/sys/pci/if_sf.c#13 integrate
.. //depot/projects/ia64/sys/pci/if_sis.c#19 integrate
.. //depot/projects/ia64/sys/pci/if_sk.c#13 integrate
.. //depot/projects/ia64/sys/pci/if_ste.c#17 integrate
.. //depot/projects/ia64/sys/pci/if_ti.c#21 integrate
.. //depot/projects/ia64/sys/pci/if_tl.c#12 integrate
.. //depot/projects/ia64/sys/pci/if_vr.c#19 integrate
.. //depot/projects/ia64/sys/pci/if_wb.c#14 integrate
.. //depot/projects/ia64/sys/pci/if_xl.c#30 integrate
.. //depot/projects/ia64/sys/powerpc/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/powerpc/include/bus.h#9 integrate
.. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#5 integrate
.. //depot/projects/ia64/sys/powerpc/powermac/macio.c#8 integrate
.. //depot/projects/ia64/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/ia64/sys/powerpc/psim/ata_iobus.c#4 integrate
.. //depot/projects/ia64/sys/powerpc/psim/iobus.c#4 integrate
.. //depot/projects/ia64/sys/sparc64/include/_limits.h#1 branch
.. //depot/projects/ia64/sys/sys/disklabel.h#24 integrate
.. //depot/projects/ia64/sys/sys/param.h#31 integrate
.. //depot/projects/ia64/sys/sys/proc.h#56 integrate
.. //depot/projects/ia64/sys/vm/uma_core.c#37 integrate
.. //depot/projects/ia64/sys/vm/vm_glue.c#22 integrate
.. //depot/projects/ia64/sys/vm/vm_mmap.c#18 integrate
.. //depot/projects/ia64/sys/vm/vnode_pager.c#29 integrate
.. //depot/projects/ia64/sys/x86_64/include/_limits.h#1 branch
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#10 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.usholiday#2 integrate
.. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#6 integrate
.. //depot/projects/ia64/usr.sbin/fwcontrol/fwcrom.c#3 integrate
.. //depot/projects/ia64/usr.sbin/fwcontrol/fwdv.c#3 integrate
.. //depot/projects/ia64/usr.sbin/jls/jls.c#2 integrate
.. //depot/projects/ia64/usr.sbin/mrouted/map-mbone/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/mrouted/mrinfo/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/named/Makefile#6 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/add/perform.c#6 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#8 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/create.h#3 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/main.c#4 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#12 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#10 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#11 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#8 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#10 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/lib/url.c#3 integrate
.. //depot/projects/ia64/usr.sbin/pwd_mkdb/pwd_mkdb.c#4 integrate
.. //depot/projects/ia64/usr.sbin/setkey/setkey.c#2 integrate

Differences ...

==== //depot/projects/ia64/Makefile.inc1#56 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.348 2003/04/14 14:46:13 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -460,9 +460,9 @@
 .endif
 INSTKERNNAME?=	kernel
 
-KRNLSRCDIR=	${.CURDIR}/sys
-KRNLCONFDIR=	${KRNLSRCDIR}/${TARGET}/conf
-KRNLOBJDIR=	${OBJTREE}${KRNLSRCDIR}
+KERNSRCDIR?=	${.CURDIR}/sys
+KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
+KRNLOBJDIR=	${OBJTREE}${KERNSRCDIR}
 KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
@@ -510,12 +510,12 @@
 	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR}
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-	    MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
+	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
+	    ${MAKE} -DNO_CPU_CFLAGS -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
 # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules)
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
 .for target in obj depend all
 	cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \
 	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
@@ -676,7 +676,7 @@
 #
 # build-tools: Build special purpose build tools
 #
-.if defined(MODULES_WITH_WORLD) && exists(${KRNLSRCDIR}/modules)
+.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
 _aicasm= sys/modules/aic7xxx/aicasm
 .endif
 

==== //depot/projects/ia64/etc/defaults/rc.conf#28 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.171 2003/03/17 23:15:53 cjc Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.172 2003/04/16 16:29:51 mtm Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -426,6 +426,11 @@
 harvest_ethernet="YES"	# Entropy device harvests ethernet randomness
 harvest_p_to_p="YES"	# Entropy device harvests point-to-point randomness
 dmesg_enable="YES"	# Save dmesg(8) to /var/run/dmesg.boot
+jail_enable="NO"	# Set to NO to disable starting of any jails
+jail_list=""		# Space separated list of names of jails
+jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
+jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
+jail_sysvipc_allow="NO"       # Allow SystemV IPC use from within a jail
 
 ##############################################################
 ### Define source_rc_confs, the mechanism used by /etc/rc.* ##

==== //depot/projects/ia64/etc/rc.d/Makefile#10 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.11 2003/03/17 23:20:48 cjc Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.12 2003/04/16 16:27:23 mtm Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 	apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \
 	cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \
 	initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \
-	ipxrouted isdnd kadmind kerberos keyserv kldxref ldconfig local \
+	ipxrouted isdnd jail kadmind kerberos keyserv kldxref ldconfig local \
 	localdaemons lomac lpd motd mountcritlocal mountcritremote \
 	mountd moused mroute6d mrouted msgs named network1 network2 \
 	network3 network_ipv6 nfsclient nfsd nfslocking nfsserver ntpd \

==== //depot/projects/ia64/etc/sendmail/freebsd.mc#8 (text+ko) ====

@@ -44,7 +44,7 @@
 #
 
 divert(0)
-VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.27 2002/10/16 22:52:56 keramida Exp $')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.28 2003/04/18 01:25:41 gshapiro Exp $')
 OSTYPE(freebsd5)
 DOMAIN(generic)
 
@@ -86,7 +86,6 @@
 dnl DAEMON_OPTIONS(`Name=IPv6, Family=inet6')
 
 define(`confBIND_OPTS', `WorkAroundBrokenAAAA')
-define(`confMAX_MIME_HEADER_LENGTH', `256/128')
 define(`confNO_RCPT_ACTION', `add-to-undisclosed')
 define(`confPRIVACY_FLAGS', `authwarnings,noexpn,novrfy')
 MAILER(local)

==== //depot/projects/ia64/include/Makefile#25 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.195 2003/03/05 19:21:02 peter Exp $
+# $FreeBSD: src/include/Makefile,v 1.196 2003/04/17 14:14:21 nectar Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -13,7 +13,8 @@
 	fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \
 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
 	locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \
-	netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \
+	netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
+	pthread.h \
 	pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
 	resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \

==== //depot/projects/ia64/include/grp.h#9 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)grp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/grp.h,v 1.17 2002/09/18 02:07:08 mike Exp $
+ * $FreeBSD: src/include/grp.h,v 1.18 2003/04/17 14:15:25 nectar Exp $
  */
 
 #ifndef _GRP_H_
@@ -52,6 +52,11 @@
 #define	_GID_T_DECLARED
 #endif
 
+#ifndef _SIZE_T_DECLARED
+typedef __size_t	size_t;
+#define _SIZE_T_DECLARED
+#endif
+
 struct group {
 	char	*gr_name;		/* group name */
 	char	*gr_passwd;		/* group password */
@@ -70,15 +75,17 @@
 const char	*group_from_gid(gid_t, int);
 #endif
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
+/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
 int		 setgrent(void);
+int		 getgrgid_r(gid_t, struct group *, char *, size_t,
+		    struct group **);
+int		 getgrnam_r(const char *, struct group *, char *, size_t,
+		    struct group **);
 #endif
 #if __BSD_VISIBLE
-void		 setgrfile(const char *);
+int		 getgrent_r(struct group *, char *, size_t, struct group **);
 int		 setgroupent(int);
 #endif
-/*
- * XXX missing getgrgid_r(), getgrnam_r().
- */
 __END_DECLS
 
 #endif /* !_GRP_H_ */

==== //depot/projects/ia64/include/nsswitch.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $	*/
-/*	$FreeBSD: src/include/nsswitch.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
+/*	$FreeBSD: src/include/nsswitch.h,v 1.3 2003/04/17 14:14:21 nectar Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -41,20 +41,24 @@
 #define _NSSWITCH_H	1
 
 #include <sys/types.h>
+#include <stdarg.h>
 
-#include <stdarg.h>
+#define NSS_MODULE_INTERFACE_VERSION 1
 
 #ifndef _PATH_NS_CONF
 #define _PATH_NS_CONF	"/etc/nsswitch.conf"
 #endif
 
-#define	NS_CONTINUE	0
-#define	NS_RETURN	1
+/* NSS source actions */
+#define	NS_ACTION_CONTINUE	0	/* try the next source */
+#define	NS_ACTION_RETURN	1	/* look no further */
 
 #define	NS_SUCCESS	(1<<0)		/* entry was found */
 #define	NS_UNAVAIL	(1<<1)		/* source not responding, or corrupt */
 #define	NS_NOTFOUND	(1<<2)		/* source responded 'no such entry' */
-#define	NS_TRYAGAIN	(1<<3)		/* source busy, may respond to retrys */
+#define	NS_TRYAGAIN	(1<<3)		/* source busy, may respond to retry */
+#define NS_RETURN	(1<<4)		/* stop search, e.g. for ERANGE */
+#define NS_TERMINATE	(NS_SUCCESS|NS_RETURN) /* flags that end search */
 #define	NS_STATUSMASK	0x000000ff	/* bitmask to get the status flags */
 
 /*
@@ -98,13 +102,26 @@
 #define NSDB_TTYS		"ttys"
 
 /*
+ * ns_dtab `method' function signature.
+ */ 
+typedef int (*nss_method)(void *_retval, void *_mdata, va_list _ap);
+
+/*
+ * Macro for generating method prototypes.
+ */
+#define NSS_METHOD_PROTOTYPE(method) \
+	int method(void *, void *, va_list)
+
+/*
  * ns_dtab - `nsswitch dispatch table'
- * contains an entry for each source and the appropriate function to call
+ * Contains an entry for each source and the appropriate function to
+ * call.  ns_dtabs are used in the nsdispatch() API in order to allow
+ * the application to override built-in actions.
  */
-typedef struct {
-	const char	 *src;
-	int		(*callback)(void *retval, void *cb_data, va_list ap);
-	void		 *cb_data;
+typedef struct _ns_dtab {
+	const char	 *src;		/* Source this entry implements */
+	nss_method	  method;	/* Method to be called */
+	void		 *mdata;	/* Data passed to method */
 } ns_dtab;
 
 /*
@@ -130,7 +147,7 @@
  * used by the nsparser routines to store a mapping between a source
  * and its dispatch control flags for a given database.
  */
-typedef struct {
+typedef struct _ns_src {
 	const char	*name;
 	u_int32_t	 flags;
 } ns_src;
@@ -142,7 +159,39 @@
  */
 extern const ns_src __nsdefaultsrc[];
 
+/*
+ * ns_mtab - NSS method table
+ * An NSS module provides a mapping from (database name, method name)
+ * tuples to the nss_method and associated data.
+ */
+typedef struct _ns_mtab {
+	const char	*database;
+	const char	*name;
+	nss_method	 method;
+	void		*mdata;
+} ns_mtab;
+
+/*
+ * NSS module de-registration, called at module unload.
+ */
+typedef void	 (*nss_module_unregister_fn)(ns_mtab *, unsigned int);
 
+/*
+ * NSS module registration, called at module load.
+ */
+typedef ns_mtab *(*nss_module_register_fn)(const char *, unsigned int *,
+		       nss_module_unregister_fn *);
+
+/* 
+ * Many NSS interfaces follow the getXXnam, getXXid, getXXent pattern.
+ * Developers are encouraged to use nss_lookup_type where approriate.
+ */
+enum nss_lookup_type {
+	nss_lt_name = 1,
+	nss_lt_id   = 2,
+	nss_lt_all  = 3
+};
+
 #ifdef _NS_PRIVATE
 
 /*
@@ -154,12 +203,23 @@
  * for each database in /etc/nsswitch.conf there is a ns_dbt, with its
  * name and a list of ns_src's containing the source information.
  */
-typedef struct {
+typedef struct _ns_dbt {
 	const char	*name;		/* name of database */
 	ns_src		*srclist;	/* list of sources */
 	int		 srclistsize;	/* size of srclist */
 } ns_dbt;
 
+/*
+ * ns_mod - NSS module
+ */
+typedef struct _ns_mod {
+	char		*name;		/* module name */
+	void		*handle;	/* handle from dlopen */
+	ns_mtab		*mtab;		/* method table */
+	unsigned int	 mtabsize;	/* count of entries in method table */
+	nss_module_unregister_fn unregister; /* called to unload module */
+} ns_mod;
+
 #endif /* _NS_PRIVATE */
 
 
@@ -171,12 +231,14 @@
 
 #ifdef _NS_PRIVATE
 extern	void		 _nsdbtaddsrc(ns_dbt *, const ns_src *);
-extern	void		 _nsdbtdump(const ns_dbt *);
-extern	const ns_dbt	*_nsdbtget(const char *);
 extern	void		 _nsdbtput(const ns_dbt *);
 extern	void		 _nsyyerror(const char *);
 extern	int		 _nsyylex(void);
+extern	int		 _nsyyparse(void);
 extern	int		 _nsyylineno;
+#ifdef _NSS_DEBUG
+extern	void		 _nsdbtdump(const ns_dbt *);
+#endif
 #endif /* _NS_PRIVATE */
 
 __END_DECLS

==== //depot/projects/ia64/include/pwd.h#8 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/pwd.h,v 1.13 2002/08/21 16:19:55 mike Exp $
+ * $FreeBSD: src/include/pwd.h,v 1.15 2003/04/18 14:11:17 nectar Exp $
  */
 
 #ifndef _PWD_H_
@@ -60,6 +60,11 @@
 #define	_UID_T_DECLARED
 #endif
 
+#ifndef _SIZE_T_DECLARED
+typedef __size_t	size_t;
+#define _SIZE_T_DECLARED
+#endif
+
 #define _PATH_PWD		"/etc"
 #define	_PATH_PASSWD		"/etc/passwd"
 #define	_PASSWD			"passwd"
@@ -73,11 +78,36 @@
 
 #define	_PATH_PWD_MKDB		"/usr/sbin/pwd_mkdb"
 
-#define	_PW_KEYBYNAME		'1'	/* stored by name */
-#define	_PW_KEYBYNUM		'2'	/* stored by entry in the "file" */
-#define	_PW_KEYBYUID		'3'	/* stored by uid */
-#define _PW_KEYYPENABLED	'4'	/* YP is enabled */
-#define	_PW_KEYYPBYNUM		'5'	/* special +@netgroup entries */
+/* Historically, the keys in _PATH_MP_DB/_PATH_SMP_DB had the format
+ * `1 octet tag | key', where the tag is one of the _PW_KEY* values
+ * listed below.  These values happen to be ASCII digits.  Starting
+ * with FreeBSD 5.1, the tag is now still a single octet, but the
+ * upper 4 bits are interpreted as a version.  Pre-FreeBSD 5.1 format
+ * entries are version `3' -- this conveniently results in the same
+ * key values as before.  The new, architecture-independent entries
+ * are version `4'.
+ * As it happens, some applications read the database directly.
+ * (Bad app, no cookie!)  Thus, we leave the _PW_KEY* symbols at their
+ * old pre-FreeBSD 5.1 values so these apps still work.  Consequently
+ * we have to do muck around a bit more to get the correct, versioned
+ * tag, and that is what the _PW_VERSIONED macros is about.
+ */
+
+#define _PW_VERSION_MASK	'0xF0'
+#define _PW_VERSIONED(x, v)	((unsigned char)(((x) & 0xCF) | ((v)<<4)))
+
+#define	_PW_KEYBYNAME		'\x31'	/* stored by name */
+#define	_PW_KEYBYNUM		'\x32'	/* stored by entry in the "file" */
+#define	_PW_KEYBYUID		'\x33'	/* stored by uid */
+#define _PW_KEYYPENABLED	'\x34'	/* YP is enabled */
+#define	_PW_KEYYPBYNUM		'\x35'	/* special +@netgroup entries */
+
+/* The database also contains a key to indicate the format version of
+ * the entries therein.  There may be other, older versioned entries
+ * as well.
+ */
+#define _PWD_VERSION_KEY	"\xFF" "VERSION"
+#define _PWD_CURRENT_VERSION	'\x04'
 
 #define	_PASSWORD_EFMT1		'_'	/* extended encryption format */
 
@@ -110,6 +140,9 @@
 #define _PWF_SHELL	_PWF(8)
 #define _PWF_EXPIRE	_PWF(9)
 
+/* XXX These flags are bogus.  With nsswitch, there are many
+ * possible sources and they cannot be represented in a small integer.
+ */                           
 #define _PWF_SOURCE	0x3000
 #define _PWF_FILES	0x1000
 #define _PWF_NIS	0x2000
@@ -123,12 +156,14 @@
 void		 endpwent(void);
 struct passwd	*getpwent(void);
 void		 setpwent(void);
-/*
- * XXX missing getpwnam_r() and getpwuid_r().
- */
+int		 getpwnam_r(const char *, struct passwd *, char *, size_t,
+		    struct passwd **);
+int		 getpwuid_r(uid_t, struct passwd *, char *, size_t,
+		    struct passwd **);
 #endif
 
 #if __BSD_VISIBLE
+int		 getpwent_r(struct passwd *, char *, size_t, struct passwd **);
 int		 setpassent(int);
 const char	*user_from_uid(uid_t, int);
 #endif

==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#23 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.105 2003/04/07 12:55:00 mdodd Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.106 2003/04/17 14:14:22 nectar Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -93,7 +93,9 @@
 	getnetgrent.3 setnetgrent.3
 MLINKS+=getprogname.3 setprogname.3
 MLINKS+=getpwent.3 endpwent.3 getpwent.3 getpwnam.3 getpwent.3 getpwuid.3 \
-	getpwent.3 setpassent.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3
+	getpwent.3 setpassent.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3 \
+	getpwent.3 getpwent_r.3 getpwent.3 getpwnam_r.3 \
+	getpwent.3 getpwuid_r.3
 MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
 	getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \
 	getttyent.3 setttyent.3

==== //depot/projects/ia64/lib/libc/gen/getgrent.3#4 (text+ko) ====

@@ -30,17 +30,19 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.21 2002/12/18 13:33:02 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.22 2003/04/17 14:15:26 nectar Exp $
 .\"
-.Dd September 29, 1994
+.Dd April 16, 2003
 .Dt GETGRENT 3
 .Os
 .Sh NAME
 .Nm getgrent ,
+.Nm getgrent_r ,
 .Nm getgrnam ,
+.Nm getgrnam_r ,
 .Nm getgrgid ,
+.Nm getgrgid_r ,
 .Nm setgroupent ,
-.\" .Nm setgrfile ,
 .Nm setgrent ,
 .Nm endgrent
 .Nd group database operations
@@ -50,14 +52,18 @@
 .In grp.h
 .Ft struct group *
 .Fn getgrent void
+.Ft int
+.Fn getgrent_r "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
 .Ft struct group *
 .Fn getgrnam "const char *name"
+.Ft int
+.Fn getgrnam_r "const char *name" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
 .Ft struct group *
 .Fn getgrgid "gid_t gid"
 .Ft int
+.Fn getgrgid_r "gid_t gid" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
+.Ft int
 .Fn setgroupent "int stayopen"
-.\" .Ft void
-.\" .Fn setgrfile "const char *name"
 .Ft int
 .Fn setgrent void
 .Ft void
@@ -99,7 +105,36 @@
 sequentially reads the group database and is intended for programs
 that wish to step through the complete list of groups.
 .Pp
-All three routines will open the group file for reading, if necessary.
+The functions
+.Fn getgrent_r ,
+.Fn getgrnam_r ,
+and
+.Fn getgrgid_r
+are thread-safe versions of
+.Fn getgrent ,
+.Fn getgrnam ,
+and
+.Fn getgrgid ,
+respectively.
+The caller must provide storage for the results of the search in
+the
+.Fa grp ,
+.Fa buffer ,
+.Fa bufsize ,
+and
+.Fa result
+arguments.
+When these functions are successful, the
+.Fa grp
+argument will be filled-in, and a pointer to that argument will be
+stored in
+.Fa result .
+If an entry is not found or an error occurs,
+.Fa result
+will be set to
+.Dv NULL .
+.Pp
+These functions will open the group file for reading, if necessary.
 .Pp
 The
 .Fn setgroupent
@@ -130,8 +165,25 @@
 .Fn getgrnam ,
 and
 .Fn getgrgid ,
-return a pointer to the group entry if successful; if end-of-file
-is reached or an error occurs a null pointer is returned.
+return a pointer to a group structure on success or
+.Dv NULL
+if the entry is not found or if an error occurs.
+In the latter case,
+.Va errno
+will be set.
+The functions
+.Fn getgrent_r ,
+.Fn getgrnam_r ,
+and
+.Fn getgrgid_r
+return 0 if no error occurred, or an error number to indicate failure.
+It is not an error if a matching entry is not found.
+(Thus, if
+.Fa result
+is set to
+.Dv NULL
+and the return value is 0, no matching entry exists.)
+.Pp
 The functions
 .Fn setgroupent
 and
@@ -169,6 +221,30 @@
 .Fn setgroupent
 appeared in
 .Bx 4.3 Reno .
+The functions
+.Fn getgrent_r ,
+.Fn getgrnam_r ,
+and
+.Fn getgrgid_r
+appeared in
+.Fx 5.1 .
+.Sh STANDARDS
+The
+.Fn getgrent ,
+.Fn getgrnam ,
+.Fn getgrnam_r ,
+.Fn getgrgid ,
+.Fn getgrgid_r
+and
+.Fn endgrent
+functions conform to
+.St -p1003.1-96 .
+The
+.Fn setgrent
+function differs from that standard in that its return type is
+.Vt int
+rather than
+.Vt void .
 .Sh COMPATIBILITY
 The historic function
 .Fn setgrfile ,
@@ -190,6 +266,7 @@
 .Pp
 The functions
 .Fn getgrent ,
+.Fn getgrent_r ,
 .Fn endgrent ,
 .Fn setgroupent ,
 and
@@ -198,7 +275,9 @@
 avoided, if possible.
 The
 .Fn getgrent
-function
-makes no attempt to suppress duplicate information if multiple
+and
+.Fn getgrent_r
+functions
+make no attempt to suppress duplicate information if multiple
 sources are specified in
 .Xr nsswitch.conf 5 .

==== //depot/projects/ia64/lib/libc/gen/getgrent.c#5 (text+ko) ====

@@ -1,7 +1,12 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Portions Copyright (c) 1994, Jason Downs. All Rights Reserved.
+/*-
+ * Copyright (c) 2003 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by
+ * Jacques A. Vidrine, Safeport Network Services, and Network
+ * Associates Laboratories, the Security Research Division of Network
+ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -11,18 +16,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -30,679 +28,1095 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
-#endif /* LIBC_SCCS and not lint */
-/*	$NetBSD: getgrent.c,v 1.34.2.1 1999/04/27 14:10:58 perry Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.24 2003/03/19 14:01:35 robert Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.26 2003/04/18 01:00:37 nectar Exp $");
 
-#include <sys/types.h>
-
+#include "namespace.h"
+#include <sys/param.h>
+#ifdef YP
+#include <rpc/rpc.h>
+#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/ypclnt.h>
+#endif
+#include <ctype.h>
 #include <errno.h>

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304181818.h3IIIOiv016407>