PERFORCE change 78297 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Jun 10 01:30:15 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=78297
Change 78297 by marcel at marcel_nfs on 2005/06/10 01:29:36
IFC @78292
Affected files ...
.. //depot/projects/tty/Makefile.inc1#21 integrate
.. //depot/projects/tty/UPDATING#21 integrate
.. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#9 integrate
.. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#9 integrate
.. //depot/projects/tty/contrib/sendmail/cf/README#8 integrate
.. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#9 integrate
.. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#9 integrate
.. //depot/projects/tty/contrib/sendmail/doc/op/op.me#8 integrate
.. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#8 integrate
.. //depot/projects/tty/contrib/sendmail/include/sm/sem.h#1 branch
.. //depot/projects/tty/contrib/sendmail/include/sm/shm.h#4 integrate
.. //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#4 integrate
.. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#6 integrate
.. //depot/projects/tty/contrib/sendmail/libsm/sem.c#1 branch
.. //depot/projects/tty/contrib/sendmail/libsm/shm.c#4 integrate
.. //depot/projects/tty/contrib/sendmail/libsm/t-sem.c#1 branch
.. //depot/projects/tty/contrib/sendmail/libsm/t-shm.c#4 integrate
.. //depot/projects/tty/contrib/sendmail/src/README#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/TRACEFLAGS#5 integrate
.. //depot/projects/tty/contrib/sendmail/src/collect.c#7 integrate
.. //depot/projects/tty/contrib/sendmail/src/conf.c#11 integrate
.. //depot/projects/tty/contrib/sendmail/src/daemon.c#8 integrate
.. //depot/projects/tty/contrib/sendmail/src/deliver.c#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/domain.c#6 integrate
.. //depot/projects/tty/contrib/sendmail/src/envelope.c#4 integrate
.. //depot/projects/tty/contrib/sendmail/src/map.c#6 integrate
.. //depot/projects/tty/contrib/sendmail/src/mci.c#8 integrate
.. //depot/projects/tty/contrib/sendmail/src/milter.c#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/queue.c#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/sendmail.h#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#9 integrate
.. //depot/projects/tty/contrib/sendmail/src/tls.c#8 integrate
.. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#7 integrate
.. //depot/projects/tty/contrib/sendmail/src/version.c#9 integrate
.. //depot/projects/tty/contrib/tcpdump/print-bgp.c#5 integrate
.. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#5 integrate
.. //depot/projects/tty/contrib/tcpdump/print-rsvp.c#3 integrate
.. //depot/projects/tty/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/tty/etc/defaults/rc.conf#13 integrate
.. //depot/projects/tty/etc/devd.conf#14 integrate
.. //depot/projects/tty/etc/ftpusers#5 integrate
.. //depot/projects/tty/etc/group#5 integrate
.. //depot/projects/tty/etc/mail/aliases#6 integrate
.. //depot/projects/tty/etc/master.passwd#5 integrate
.. //depot/projects/tty/etc/mtree/BSD.include.dist#14 integrate
.. //depot/projects/tty/etc/network.subr#6 integrate
.. //depot/projects/tty/etc/pccard_ether#8 integrate
.. //depot/projects/tty/etc/rc.d/altqd#2 delete
.. //depot/projects/tty/etc/rc.d/dhclient#6 integrate
.. //depot/projects/tty/etc/rc.d/dhcpd#2 delete
.. //depot/projects/tty/etc/rc.d/dhcrelay#2 delete
.. //depot/projects/tty/etc/rc.d/downinterfaces#2 delete
.. //depot/projects/tty/etc/rc.d/dumpon#6 integrate
.. //depot/projects/tty/etc/rc.d/gated#2 delete
.. //depot/projects/tty/etc/rc.d/ifwatchd#2 delete
.. //depot/projects/tty/etc/rc.d/kdc#2 delete
.. //depot/projects/tty/etc/rc.d/lkm1#2 delete
.. //depot/projects/tty/etc/rc.d/lkm2#2 delete
.. //depot/projects/tty/etc/rc.d/lkm3#2 delete
.. //depot/projects/tty/etc/rc.d/mixerctl#2 delete
.. //depot/projects/tty/etc/rc.d/mopd#2 delete
.. //depot/projects/tty/etc/rc.d/mountall#2 delete
.. //depot/projects/tty/etc/rc.d/ndbootd#2 delete
.. //depot/projects/tty/etc/rc.d/netif#6 integrate
.. //depot/projects/tty/etc/rc.d/network#3 delete
.. //depot/projects/tty/etc/rc.d/poffd#2 delete
.. //depot/projects/tty/etc/rc.d/postfix#2 delete
.. //depot/projects/tty/etc/rc.d/ppp#2 delete
.. //depot/projects/tty/etc/rc.d/racoon#2 delete
.. //depot/projects/tty/etc/rc.d/raidframe#2 delete
.. //depot/projects/tty/etc/rc.d/rbootd#2 delete
.. //depot/projects/tty/etc/rc.d/rtsold#2 delete
.. //depot/projects/tty/etc/rc.d/screenblank#2 delete
.. //depot/projects/tty/etc/rc.d/swap2#2 delete
.. //depot/projects/tty/etc/rc.d/sysdb#2 delete
.. //depot/projects/tty/etc/rc.d/wscons#2 delete
.. //depot/projects/tty/etc/rc.d/xdm#2 delete
.. //depot/projects/tty/etc/rc.d/xfs#2 delete
.. //depot/projects/tty/games/fortune/datfiles/fortunes#15 integrate
.. //depot/projects/tty/games/morse/morse.6#5 integrate
.. //depot/projects/tty/games/morse/morse.c#4 integrate
.. //depot/projects/tty/gnu/usr.bin/gzip/gzip.c#3 integrate
.. //depot/projects/tty/include/Makefile#17 integrate
.. //depot/projects/tty/lib/libpam/modules/pam_ssh/Makefile#6 integrate
.. //depot/projects/tty/lib/libpmc/Makefile#3 integrate
.. //depot/projects/tty/lib/libpmc/libpmc.c#3 integrate
.. //depot/projects/tty/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/tty/lib/libpmc/pmc.h#3 integrate
.. //depot/projects/tty/lib/libpmc/pmclog.3#1 branch
.. //depot/projects/tty/lib/libpmc/pmclog.c#1 branch
.. //depot/projects/tty/lib/libpmc/pmclog.h#1 branch
.. //depot/projects/tty/lib/libsm/Makefile#7 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate
.. //depot/projects/tty/rescue/rescue/Makefile#10 integrate
.. //depot/projects/tty/sbin/Makefile#16 integrate
.. //depot/projects/tty/sbin/atacontrol/atacontrol.c#10 integrate
.. //depot/projects/tty/sbin/dhclient/Makefile#4 integrate
.. //depot/projects/tty/sbin/dhclient/Makefile.inc#6 delete
.. //depot/projects/tty/sbin/dhclient/alloc.c#1 branch
.. //depot/projects/tty/sbin/dhclient/bpf.c#1 branch
.. //depot/projects/tty/sbin/dhclient/client/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/clparse.c#1 branch
.. //depot/projects/tty/sbin/dhclient/common/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/conflex.c#1 branch
.. //depot/projects/tty/sbin/dhclient/convert.c#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient-script#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient-script.8#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient-script.sh#2 delete
.. //depot/projects/tty/sbin/dhclient/dhclient.8#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient.c#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient.conf#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient.conf.5#1 branch
.. //depot/projects/tty/sbin/dhclient/dhclient.leases.5#1 branch
.. //depot/projects/tty/sbin/dhclient/dhcp-options.5#1 branch
.. //depot/projects/tty/sbin/dhclient/dhcp.h#1 branch
.. //depot/projects/tty/sbin/dhclient/dhcpctl/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/dhcpd.h#1 branch
.. //depot/projects/tty/sbin/dhclient/dhctoken.h#1 branch
.. //depot/projects/tty/sbin/dhclient/dispatch.c#1 branch
.. //depot/projects/tty/sbin/dhclient/dst/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/errwarn.c#1 branch
.. //depot/projects/tty/sbin/dhclient/hash.c#1 branch
.. //depot/projects/tty/sbin/dhclient/inet.c#1 branch
.. //depot/projects/tty/sbin/dhclient/minires/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/omapip/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/omshell/Makefile#3 delete
.. //depot/projects/tty/sbin/dhclient/options.c#1 branch
.. //depot/projects/tty/sbin/dhclient/packet.c#1 branch
.. //depot/projects/tty/sbin/dhclient/parse.c#1 branch
.. //depot/projects/tty/sbin/dhclient/privsep.c#1 branch
.. //depot/projects/tty/sbin/dhclient/privsep.h#1 branch
.. //depot/projects/tty/sbin/dhclient/tables.c#1 branch
.. //depot/projects/tty/sbin/dhclient/tree.c#1 branch
.. //depot/projects/tty/sbin/dhclient/tree.h#1 branch
.. //depot/projects/tty/sbin/ipfw/ipfw2.c#15 integrate
.. //depot/projects/tty/sbin/savecore/savecore.8#6 integrate
.. //depot/projects/tty/secure/lib/libssh/Makefile#7 integrate
.. //depot/projects/tty/secure/libexec/sftp-server/Makefile#6 integrate
.. //depot/projects/tty/secure/libexec/ssh-keysign/Makefile#4 integrate
.. //depot/projects/tty/secure/usr.bin/scp/Makefile#4 integrate
.. //depot/projects/tty/secure/usr.bin/sftp/Makefile#5 integrate
.. //depot/projects/tty/secure/usr.bin/ssh-add/Makefile#4 integrate
.. //depot/projects/tty/secure/usr.bin/ssh-agent/Makefile#4 integrate
.. //depot/projects/tty/secure/usr.bin/ssh-keygen/Makefile#4 integrate
.. //depot/projects/tty/secure/usr.bin/ssh-keyscan/Makefile#3 integrate
.. //depot/projects/tty/secure/usr.bin/ssh/Makefile#7 integrate
.. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#8 integrate
.. //depot/projects/tty/share/examples/pppd/ppp.deny.sample#5 integrate
.. //depot/projects/tty/share/man/man4/ata.4#7 integrate
.. //depot/projects/tty/share/man/man4/ataraid.4#2 integrate
.. //depot/projects/tty/share/man/man4/fwohci.4#9 integrate
.. //depot/projects/tty/share/man/man4/gif.4#4 integrate
.. //depot/projects/tty/share/man/man4/hwpmc.4#3 integrate
.. //depot/projects/tty/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/tty/share/man/man4/man4.i386/acpi_ibm.4#2 integrate
.. //depot/projects/tty/share/man/man4/snd_maestro3.4#3 integrate
.. //depot/projects/tty/share/man/man5/rc.conf.5#18 integrate
.. //depot/projects/tty/share/man/man8/crash.8#2 integrate
.. //depot/projects/tty/share/misc/bsd-family-tree#13 integrate
.. //depot/projects/tty/sys/alpha/conf/GENERIC#14 integrate
.. //depot/projects/tty/sys/alpha/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/alpha/linux/linux_proto.h#8 integrate
.. //depot/projects/tty/sys/alpha/linux/linux_syscall.h#8 integrate
.. //depot/projects/tty/sys/alpha/linux/linux_sysent.c#8 integrate
.. //depot/projects/tty/sys/alpha/linux/syscalls.master#9 integrate
.. //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#8 integrate
.. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#10 integrate
.. //depot/projects/tty/sys/amd64/include/apicvar.h#6 integrate
.. //depot/projects/tty/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#4 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#4 integrate
.. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#4 integrate
.. //depot/projects/tty/sys/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/tty/sys/arm/arm/intr.c#5 integrate
.. //depot/projects/tty/sys/arm/arm/nexus.c#4 integrate
.. //depot/projects/tty/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/tty/sys/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/tty/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/tty/sys/arm/include/intr.h#4 integrate
.. //depot/projects/tty/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/tty/sys/arm/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/arm/include/vmparam.h#4 integrate
.. //depot/projects/tty/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/i80321.c#3 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/iq80321.c#4 integrate
.. //depot/projects/tty/sys/cam/scsi/scsi_da.c#14 integrate
.. //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/tty/sys/compat/linux/linux_misc.c#14 integrate
.. //depot/projects/tty/sys/compat/linux/linux_stats.c#12 integrate
.. //depot/projects/tty/sys/conf/NOTES#24 integrate
.. //depot/projects/tty/sys/conf/files#31 integrate
.. //depot/projects/tty/sys/conf/files.alpha#14 integrate
.. //depot/projects/tty/sys/conf/files.amd64#17 integrate
.. //depot/projects/tty/sys/conf/files.arm#4 integrate
.. //depot/projects/tty/sys/conf/files.i386#23 integrate
.. //depot/projects/tty/sys/conf/files.ia64#17 integrate
.. //depot/projects/tty/sys/conf/files.pc98#19 integrate
.. //depot/projects/tty/sys/conf/files.powerpc#9 integrate
.. //depot/projects/tty/sys/conf/files.sparc64#15 integrate
.. //depot/projects/tty/sys/conf/kern.post.mk#16 integrate
.. //depot/projects/tty/sys/conf/options#22 integrate
.. //depot/projects/tty/sys/conf/options.arm#4 integrate
.. //depot/projects/tty/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/tty/sys/dev/ata/ata-chipset.c#21 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.c#16 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.h#17 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.c#19 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.h#11 integrate
.. //depot/projects/tty/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/tty/sys/dev/ath/if_athvar.h#7 integrate
.. //depot/projects/tty/sys/dev/ed/if_ed_pci.c#8 integrate
.. //depot/projects/tty/sys/dev/fxp/if_fxp.c#16 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_alpha.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.h#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_arm.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ia64.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_intel.c#3 delete
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_logging.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_pentium.h#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#5 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.h#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_powerpc.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.h#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_sparc64.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_x86.c#1 branch
.. //depot/projects/tty/sys/dev/hwpmc/pmc_events.h#1 branch
.. //depot/projects/tty/sys/dev/pccbb/pccbb_pci.c#4 integrate
.. //depot/projects/tty/sys/gnu/ext2fs/ext2_vnops.c#10 integrate
.. //depot/projects/tty/sys/i386/i386/mp_machdep.c#18 integrate
.. //depot/projects/tty/sys/i386/include/apicvar.h#7 integrate
.. //depot/projects/tty/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/tty/sys/i386/linux/linux_proto.h#9 integrate
.. //depot/projects/tty/sys/i386/linux/linux_syscall.h#9 integrate
.. //depot/projects/tty/sys/i386/linux/linux_sysent.c#10 integrate
.. //depot/projects/tty/sys/i386/linux/syscalls.master#9 integrate
.. //depot/projects/tty/sys/ia64/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/kern/imgact_shell.c#6 integrate
.. //depot/projects/tty/sys/kern/kern_exec.c#18 integrate
.. //depot/projects/tty/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/tty/sys/kern/kern_ktrace.c#11 integrate
.. //depot/projects/tty/sys/kern/kern_pmc.c#3 integrate
.. //depot/projects/tty/sys/kern/kern_sig.c#15 integrate
.. //depot/projects/tty/sys/kern/kern_switch.c#17 integrate
.. //depot/projects/tty/sys/kern/sched_4bsd.c#11 integrate
.. //depot/projects/tty/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/tty/sys/kern/subr_bus.c#13 integrate
.. //depot/projects/tty/sys/kern/subr_prf.c#10 integrate
.. //depot/projects/tty/sys/kern/sysv_sem.c#12 integrate
.. //depot/projects/tty/sys/kern/uipc_sem.c#9 integrate
.. //depot/projects/tty/sys/kern/uipc_socket.c#14 integrate
.. //depot/projects/tty/sys/kern/vfs_aio.c#15 integrate
.. //depot/projects/tty/sys/kern/vfs_bio.c#17 integrate
.. //depot/projects/tty/sys/kern/vfs_default.c#15 integrate
.. //depot/projects/tty/sys/kern/vfs_subr.c#18 integrate
.. //depot/projects/tty/sys/kern/vfs_syscalls.c#16 integrate
.. //depot/projects/tty/sys/kern/vnode_if.src#7 integrate
.. //depot/projects/tty/sys/modules/hwpmc/Makefile#3 integrate
.. //depot/projects/tty/sys/net/bpf.c#13 integrate
.. //depot/projects/tty/sys/net/if.c#16 integrate
.. //depot/projects/tty/sys/net/if_bridge.c#2 integrate
.. //depot/projects/tty/sys/net/rtsock.c#11 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_crypto.h#4 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_crypto_none.c#2 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_crypto_wep.c#2 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_input.c#7 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_ioctl.c#7 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_node.h#6 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_output.c#7 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/tty/sys/netgraph/ng_lmi.c#6 integrate
.. //depot/projects/tty/sys/netgraph/ng_tee.c#7 integrate
.. //depot/projects/tty/sys/netinet/tcp_sack.c#10 integrate
.. //depot/projects/tty/sys/powerpc/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/security/mac/mac_sysv_sem.c#2 integrate
.. //depot/projects/tty/sys/security/mac_biba/mac_biba.c#14 integrate
.. //depot/projects/tty/sys/security/mac_mls/mac_mls.c#14 integrate
.. //depot/projects/tty/sys/security/mac_stub/mac_stub.c#8 integrate
.. //depot/projects/tty/sys/security/mac_test/mac_test.c#11 integrate
.. //depot/projects/tty/sys/sparc64/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/sys/event.h#6 integrate
.. //depot/projects/tty/sys/sys/jail.h#6 integrate
.. //depot/projects/tty/sys/sys/mac.h#13 integrate
.. //depot/projects/tty/sys/sys/mac_policy.h#11 integrate
.. //depot/projects/tty/sys/sys/mount.h#10 integrate
.. //depot/projects/tty/sys/sys/pmc.h#5 integrate
.. //depot/projects/tty/sys/sys/pmckern.h#3 integrate
.. //depot/projects/tty/sys/sys/pmclog.h#1 branch
.. //depot/projects/tty/sys/sys/syscallsubr.h#10 integrate
.. //depot/projects/tty/sys/sys/user.h#8 integrate
.. //depot/projects/tty/sys/sys/vnode.h#15 integrate
.. //depot/projects/tty/sys/tools/vnode_if.awk#6 integrate
.. //depot/projects/tty/sys/ufs/ffs/ffs_vnops.c#14 integrate
.. //depot/projects/tty/sys/ufs/ufs/ufs_vnops.c#13 integrate
.. //depot/projects/tty/usr.sbin/Makefile#19 integrate
.. //depot/projects/tty/usr.sbin/arp/arp.c#8 integrate
.. //depot/projects/tty/usr.sbin/jail/jail.8#14 integrate
.. //depot/projects/tty/usr.sbin/ntp/doc/ntp.conf.5#5 integrate
.. //depot/projects/tty/usr.sbin/pkg_install/create/create.h#4 integrate
.. //depot/projects/tty/usr.sbin/pkg_install/create/main.c#4 integrate
.. //depot/projects/tty/usr.sbin/pkg_install/create/perform.c#4 integrate
.. //depot/projects/tty/usr.sbin/pkg_install/create/pkg_create.1#6 integrate
.. //depot/projects/tty/usr.sbin/pmccontrol/pmccontrol.c#3 integrate
.. //depot/projects/tty/usr.sbin/pmcstat/pmcstat.8#2 integrate
.. //depot/projects/tty/usr.sbin/pmcstat/pmcstat.c#3 integrate
.. //depot/projects/tty/usr.sbin/rtsold/rtsold.c#4 integrate
.. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate
Differences ...
==== //depot/projects/tty/Makefile.inc1#21 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.496 2005/05/31 04:45:47 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.497 2005/06/06 09:39:46 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -227,21 +227,21 @@
MACHINE_ARCH=i386 \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
- CC="cc ${LIB32CC}" \
- CXX="c++ ${LIB32CXX}" \
- OBJC="cc ${LIB32OBJC}" \
- LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
- AS="as --32" \
+ CC="${CC} ${LIB32CC}" \
+ CXX="${CXX} ${LIB32CXX}" \
+ OBJC="${OBJC} ${LIB32OBJC}" \
+ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+ AS="${AS} --32" \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \
- CC="cc ${LIB32CC}" \
- CXX="c++ ${LIB32CXX}" \
- OBJC="cc ${LIB32OBJC}" \
- LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
- AS="as --32" \
+ CC="${CC} ${LIB32CC}" \
+ CXX="${CXX} ${LIB32CXX}" \
+ OBJC="${OBJC} ${LIB32OBJC}" \
+ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+ AS="${AS} --32" \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32
.endif
==== //depot/projects/tty/UPDATING#21 (text+ko) ====
@@ -21,6 +21,18 @@
developers choose to disable these features on build machines
to maximize performance.
+20050609:
+ Changes were made to kinfo_proc in sys/user.h. Please recompile
+ userland, or commands like `fstat', `pkill', `ps', `top' and `w'
+ will not behave correctly.
+
+20050606:
+ The OpenBSD dhclient was imported in place of the ISC dhclient
+ and the network interface configuration scripts were updated
+ accordingly. If you use DHCP to configure your interfaces, you
+ must now run devd. Also, DNS updating was lost so you will need
+ to find a workaround if you use this feature.
+
20050605:
if_bridge was added to the tree. This has changed struct ifnet.
Please recompile userland and all network related modules.
@@ -361,4 +373,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.410 2005/06/05 03:38:03 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.412 2005/06/09 19:09:38 gad Exp $
==== //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#9 (text+ko) ====
@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.27 2005/02/14 02:45:25 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28 2005/06/07 04:22:21 gshapiro Exp $
-sendmail 8.13.3
+sendmail 8.13.4
originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
For the import of sendmail, the following files were removed:
@@ -21,8 +21,8 @@
Imported using:
- cvs import -m 'Import sendmail 8.13.3' \
- src/contrib/sendmail SENDMAIL v8_13_3
+ cvs import -m 'Import sendmail 8.13.4' \
+ src/contrib/sendmail SENDMAIL v8_13_4
To make local changes to sendmail, simply patch and commit to the main
@@ -93,4 +93,4 @@
usr.sbin/mailwrapper/Makefile
gshapiro at FreeBSD.org
-13-February-2005
+6-June-2005
==== //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#9 (text+ko) ====
@@ -1,11 +1,65 @@
SENDMAIL RELEASE NOTES
- $Id: RELEASE_NOTES,v 8.1709 2005/01/12 04:32:31 ca Exp $
+ $Id: RELEASE_NOTES,v 8.1730 2005/03/28 00:31:23 gshapiro Exp $
This listing shows the version of the sendmail binary, the version
of the sendmail configuration files, the date of release, and a
summary of the changes in that release.
+8.13.4/8.13.4 2005/03/27
+ The bug fixes in 8.13.3 for connection handling uncovered a
+ different error which could result in connections that
+ stay in CLOSE_WAIT state due to a variable that was not
+ properly initialized. Problem noted by Michael Sims.
+ Deal with empty hostnames in hostsignature(). This bug could lead
+ to an endless loop when doing LMTP deliveries to another
+ host. Problem first reported by Martin Lathoud and
+ tracked down by Gael Roualland.
+ Make sure return parameters are initialized in getmxrr(). Problem
+ found by Gael Roualland using valgrind.
+ If shared memory is used and the RunAsUser option is set, then the
+ owner and group of the shared memory segment is set to
+ the ids specified RunAsUser and the access mode is set
+ to 0660 to allow for updates by sendmail processes.
+ The number of queue entries that is (optionally) kept in shared
+ memory was wrong in some cases, e.g., envelope splitting
+ and bounce generation.
+ Undo a change made in 8.13.0 to silently truncate long strings
+ in address rewriting because the message can be triggered
+ for header checks where long strings are legitimate.
+ Problem reported by Mary Verge DeSisto, and tracked
+ down with the help of John Beck of Sun Microsystems.
+ The internal stab map did not obey the -m flag. Patch from
+ Rob McMahon of Warwick University, England.
+ The socket map did not obey the -f flag. Problem noted by
+ Dan Ringdahl, forwarded by Andrzej Filip.
+ The addition of LDAP recursion in 8.13.0 broke enforcement of
+ the LDAP map -1 argument which tells the MTA to only
+ return success if and only if a single LDAP match is found.
+ Add additional error checks in the MTA for milter communication
+ to avoid a possible segmentation fault. Based on patch
+ by Joe Maimon.
+ Do not trigger an assertion if X509_digest() returns success but
+ does not assign a value to its output parameter. Based
+ on patch by Brian Kantor.
+ Add more checks when resetting internal AUTH data (applies only
+ to Cyrus SASL version 2). Otherwise an SMTP session might
+ be dropped after an AUTH failure.
+ Portability:
+ Add LA_LONGLONG as valid LA_TYPE type for systems that use
+ "long long" to read load average data, e.g.,
+ AIX 5.1 in 32 bit mode. Note: this has to be set
+ "by hand", it is not (yet) automatically detected.
+ Problem noted by Burak Bilen.
+ Use socklen_t for accept(), etc. on AIX 5.x. This should
+ fix problems when compiling in 64 bit mode.
+ Problem first reported by Harry Meiert of
+ University of Bremen.
+ New Files:
+ include/sm/sem.h
+ libsm/sem.c
+ libsm/t-sem.c
+
8.13.3/8.13.3 2005/01/11
Enhance handling of I/O errors, especially EOF, when STARTTLS
is active.
==== //depot/projects/tty/contrib/sendmail/cf/README#8 (text+ko) ====
@@ -1593,7 +1593,7 @@
uucp-old (obsolete name: "uucp")
This is the oldest, the worst (but the closest to UUCP) way of
- sending messages accros UUCP connections. It does bangify
+ sending messages across UUCP connections. It does bangify
everything and prepends $U (your UUCP name) to the sender's
address (which can already be a bang path itself). It can
only send to one address at a time, so it spends a lot of
@@ -2662,7 +2662,7 @@
to the access map, where 10.1 is your local network. You may
want to use "RELAY" instead of "OK" to allow also relaying
-instead of just disabling the DNS lookups in the backlists.
+instead of just disabling the DNS lookups in the blacklists.
The features described above make use of the check_relay, check_mail,
@@ -2870,12 +2870,12 @@
| STARTTLS |
+----------+
-In this text, cert will be used as an abreviation for X.509 certificate,
+In this text, cert will be used as an abbreviation for X.509 certificate,
DN (CN) is the distinguished (common) name of a cert, and CA is a
certification authority, which signs (issues) certs.
For STARTTLS to be offered by sendmail you need to set at least
-this variables (the file names and paths are just examples):
+these variables (the file names and paths are just examples):
define(`confCACERT_PATH', `/etc/mail/certs/')
define(`confCACERT', `/etc/mail/certs/CA.cert.pem')
@@ -4127,12 +4127,8 @@
then the AUTH= parameter for the
MAIL FROM command is only issued
when authentication succeeded.
- Other values (which should be listed
- one after the other without any
- intervening characters except for
- space or comma) are a, c, d, f, p,
- and y. See doc/op/op.me for
- details.
+ See doc/op/op.me for more options
+ and details.
confAUTH_MAX_BITS AuthMaxBits [INT_MAX] Limit the maximum encryption
strength for the security layer in
SMTP AUTH (SASL). Default is
@@ -4587,4 +4583,4 @@
8 DNS based blacklists
9 special local rulesets (1 and 2)
-$Revision: 8.691 $, Last updated $Date: 2004/07/19 17:47:34 $
+$Revision: 8.694 $, Last updated $Date: 2005/03/23 21:41:09 $
==== //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#9 (text+ko) ====
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by ca at wiz.smi.sendmail.com on Tue Jan 11 20:36:44 PST 2005
-##### in /extra/home/ca/sm-8.13.3/OpenSource/sendmail-8.13.3/cf/cf
+##### built by ca at wiz.smi.sendmail.com on Sun Mar 27 16:38:48 PST 2005
+##### in /extra/home/ca/sm-8.13.4/OpenSource/sendmail-8.13.4/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
# Configuration version number
-DZ8.13.3/Submit
+DZ8.13.4/Submit
###############
==== //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#9 (text+ko) ====
@@ -11,8 +11,8 @@
# the sendmail distribution.
#
#
-VERSIONID(`$Id: version.m4,v 8.127 2005/01/12 04:32:32 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.132 2005/03/25 18:44:45 ca Exp $')
#
divert(0)
# Configuration version number
-DZ8.13.3`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.13.4`'ifdef(`confCF_VERSION', `/confCF_VERSION')
==== //depot/projects/tty/contrib/sendmail/doc/op/op.me#8 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1983, 1993
@@ -9,7 +9,7 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: op.me,v 8.699 2004/06/03 18:29:01 ca Exp $
+.\" $Id: op.me,v 8.704 2005/02/01 00:40:57 ca Exp $
.\"
.\" eqn op.me | pic | troff -me
.\"
@@ -90,7 +90,7 @@
.de Ve
Version \\$2
..
-.Ve $Revision: 8.699 $
+.Ve $Revision: 8.704 $
.rm Ve
.sp
For Sendmail Version 8.13
@@ -1621,7 +1621,7 @@
.i address
part of the triple is looked up as the key
(i.e., the left hand side)
-into the alias database.
+in the alias database.
If there is a match, the address is deleted from the send queue
and all addresses on the right hand side of the alias
are added in place of the alias that was found.
@@ -3916,6 +3916,11 @@
This specifies the
{mailer, host, user}
3-tuple necessary to direct the mailer.
+Note: the third element (
+.i user
+) is often also called
+.i address
+part.
If the mailer is local
the host part may be omitted\**.
.(f
@@ -4781,7 +4786,8 @@
Sender's host name.
Set from the
.b \-p
-command line flag or by the SMTP server code.
+command line flag or by the SMTP server code
+(in which case it is set to the EHLO/HELO parameter).
.ip $t
A numeric representation of the current time in the format YYYYMMDDHHmm
(4 digit year 1900-9999, 2 digit month 01-12, 2 digit day 01-31,
@@ -5514,7 +5520,7 @@
this host is known by.
This can be used to match local hostnames.
.ip $={persistentMacros}
-set to the macros would should be saved across queue runs.
+set to the macros that should be saved across queue runs.
Care should be taken when adding macro names to this class.
.pp
.i Sendmail
@@ -5596,7 +5602,8 @@
This flag defaults on if the SMTP greeting message includes the word
.q ESMTP .
.ip A
-Look up the user part of the address in the alias database.
+Look up the user (address) part of the resolved mailer triple,
+in the alias database.
Normally this is only set for local mailers.
.ip b
Force a blank line on the end of a message.
@@ -11310,7 +11317,7 @@
.\".sz 10
.\"Eric Allman
.\".sp
-.\"Version $Revision: 8.699 $
+.\"Version $Revision: 8.704 $
.\".ce 0
.bp 3
.ce
==== //depot/projects/tty/contrib/sendmail/include/sm/conf.h#8 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: conf.h,v 1.118 2004/08/20 20:30:32 ca Exp $
+ * $Id: conf.h,v 1.120 2005/03/22 22:07:53 ca Exp $
*/
/*
@@ -161,6 +161,8 @@
# ifdef _AIX5
# define _AIX4 40300
+# define SOCKADDR_LEN_T socklen_t /* e.g., arg#3 to accept, getsockname */
+# define SOCKOPT_LEN_T socklen_t /* arg#5 to getsockopt */
# if _AIX5 >= 50200
# define HASUNSETENV 1 /* has unsetenv(3) call */
# endif /* _AIX5 >= 50200 */
@@ -175,10 +177,14 @@
# define BSD4_4_SOCKADDR /* has sa_len */
# define USESETEUID 1 /* seteuid(2) works */
# define TZ_TYPE TZ_NAME /* use tzname[] vector */
-# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */
+# ifndef SOCKOPT_LEN_T
+# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */
+# endif /* SOCKOPT_LEN_T */
# if _AIX4 >= 40200
# define HASSETREUID 1 /* setreuid(2) works as of AIX 4.2 */
-# define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */
+# ifndef SOCKADDR_LEN_T
+# define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */
+# endif /* SOCKADDR_LEN_T */
# endif /* _AIX4 >= 40200 */
# if defined(_ILS_MACROS) /* IBM versions aren't side-effect clean */
# undef isascii
@@ -208,7 +214,9 @@
# define GIDSET_T gid_t
# define SFS_TYPE SFS_STATFS /* use <sys/statfs.h> statfs() impl */
# define SPT_PADCHAR '\0' /* pad process title with nulls */
-# define LA_TYPE LA_INT
+# ifndef LA_TYPE
+# define LA_TYPE LA_INT
+# endif /* LA_TYPE */
# define FSHIFT 16
# define LA_AVENRUN "avenrun"
# if !defined(_AIX4) || _AIX4 < 40300
@@ -1125,7 +1133,7 @@
# define _SCO_unix_4_2
# else /* ! _SCO_unix_4_2 */
# define SOCKADDR_LEN_T size_t /* e.g., arg#3 to accept, getsockname */
-# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */
+# define SOCKOPT_LEN_T size_t /* arg#5 to getsockopt */
# endif /* ! _SCO_unix_4_2 */
# endif /* _SCO_DS >= 1 */
@@ -1819,7 +1827,7 @@
# define HASWAITPID 1
# define HASGETDTABLESIZE 1
# define GIDSET_T gid_t
-# define SOCKADDR_LEN_T size_t
+# define SOCKADDR_LEN_T size_t
# define SOCKOPT_LEN_T size_t
# ifndef _PATH_UNIX
# define _PATH_UNIX "/stand/unix"
==== //depot/projects/tty/contrib/sendmail/include/sm/shm.h#4 (text+ko) ====
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003, 2005 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: shm.h,v 1.10 2003/05/17 18:34:54 ca Exp $
+ * $Id: shm.h,v 1.11 2005/01/13 22:57:04 ca Exp $
*/
#ifndef SM_SHM_H
@@ -28,6 +28,7 @@
extern void *sm_shmstart __P((key_t, int , int , int *, bool));
extern int sm_shmstop __P((void *, int, bool));
+extern int sm_shmsetowner __P((int, uid_t, gid_t, mode_t));
/* for those braindead systems... (e.g., SunOS 4) */
==== //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#4 (text+ko) ====
@@ -1,13 +1,13 @@
-dnl $Id: Makefile.m4,v 1.67 2004/08/20 20:42:14 ca Exp $
+dnl $Id: Makefile.m4,v 1.68 2005/02/17 23:34:25 ca Exp $
define(`confREQUIRE_LIBUNIX')
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
PREPENDDEF(`confENVDEF', `confMAPDEF')
bldPRODUCT_START(`library', `libsm')
-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c ')
+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c ')
bldPRODUCT_END
-dnl sem.c msg.c
+dnl msg.c
dnl syslogio.c
include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/sm-test.m4')
@@ -27,7 +27,7 @@
smtest(`t-float', `run')
smtest(`t-scanf', `run')
smtest(`t-shm', `run')
-dnl smtest(`t-sem', `run')
+smtest(`t-sem', `run')
dnl smtest(`t-msg', `run')
smtest(`t-cf')
smtest(`b-strcmp')
==== //depot/projects/tty/contrib/sendmail/libsm/ldap.c#6 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2005 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: ldap.c,v 1.60 2004/08/03 20:42:21 ca Exp $")
+SM_RCSID("@(#)$Id: ldap.c,v 1.62 2005/02/24 00:30:01 ca Exp $")
#if LDAPMAP
# include <sys/types.h>
@@ -589,7 +589,9 @@
LDAPMessage *entry;
/* If we don't want multiple values and we have one, break */
- if ((char) delim == '\0' && *result != NULL)
+ if ((char) delim == '\0' &&
+ !bitset(SM_LDAP_SINGLEMATCH, flags) &&
+ *result != NULL)
break;
/* Cycle through all entries */
@@ -767,19 +769,17 @@
if (*result != NULL)
{
/* already have a value */
+ if (bitset(SM_LDAP_SINGLEMATCH,
+ flags))
+ {
+ /* only wanted one match */
+ SM_LDAP_ERROR_CLEANUP();
+ errno = ENOENT;
+ return EX_NOTFOUND;
+ }
break;
}
- if (bitset(SM_LDAP_SINGLEMATCH,
- flags) &&
- *result != NULL)
- {
- /* only wanted one match */
- SM_LDAP_ERROR_CLEANUP();
- errno = ENOENT;
- return EX_NOTFOUND;
- }
-
if (lmap->ldap_attrsonly == LDAPMAP_TRUE)
{
*result = sm_rpool_strdup_x(rpool,
@@ -990,7 +990,9 @@
}
/* We don't want multiple values and we have one */
- if ((char) delim == '\0' && *result != NULL)
+ if ((char) delim == '\0' &&
+ !bitset(SM_LDAP_SINGLEMATCH, flags) &&
+ *result != NULL)
break;
}
save_errno = sm_ldap_geterrno(lmap->ldap_ld);
==== //depot/projects/tty/contrib/sendmail/libsm/shm.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003, 2005 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: shm.c,v 1.16 2003/06/13 21:18:08 ca Exp $")
+SM_RCSID("@(#)$Id: shm.c,v 1.18 2005/02/09 01:54:51 ca Exp $")
#if SM_CONF_SHM
# include <stdlib.h>
@@ -104,4 +104,38 @@
}
+/*
+** SM_SHMSETOWNER -- set owner/group/mode of shared memory segment.
+**
+** Parameters:
+** shmid -- id.
+** uid -- uid to use
+** gid -- gid to use
+** mode -- mode to use
+**
+** Returns:
+** 0 on success.
+** < 0 on failure.
+*/
+
+int
+sm_shmsetowner(shmid, uid, gid, mode)
+ int shmid;
+ uid_t uid;
+ gid_t gid;
+ mode_t mode;
+{
+ int r;
+ struct shmid_ds shmid_ds;
+
+ memset(&shmid_ds, 0, sizeof(shmid_ds));
+ if ((r = shmctl(shmid, IPC_STAT, &shmid_ds)) < 0)
+ return r;
+ shmid_ds.shm_perm.uid = uid;
+ shmid_ds.shm_perm.gid = gid;
+ shmid_ds.shm_perm.mode = mode;
+ if ((r = shmctl(shmid, IPC_SET, &shmid_ds)) < 0)
+ return r;
+ return 0;
+}
#endif /* SM_CONF_SHM */
==== //depot/projects/tty/contrib/sendmail/libsm/t-shm.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: t-shm.c,v 1.20 2004/08/03 20:51:36 ca Exp $")
+SM_RCSID("@(#)$Id: t-shm.c,v 1.22 2005/01/14 02:14:10 ca Exp $")
#include <stdio.h>
@@ -83,6 +83,10 @@
case 'v':
printf("shmval: %d\n", *shm);
break;
+ case 'S':
+ i = sm_shmsetowner(shmid, getuid(), getgid(), 0644);
+ printf("sm_shmsetowner=%d\n", i);
+ break;
}
}
return sm_shmstop((void *) shm, shmid, owner);
@@ -165,6 +169,8 @@
{
int r;
+ r = sm_shmsetowner(shmid, getuid(), getgid(), 0660);
+ SM_TEST(r == 0);
*shm = 1;
while (*shm == 1 && cnt++ < MAX_CNT)
sleep(1);
==== //depot/projects/tty/contrib/sendmail/src/README#9 (text+ko) ====
@@ -9,7 +9,7 @@
# the sendmail distribution.
#
#
-# $Id: README,v 8.385 2004/11/25 06:52:06 msk Exp $
+# $Id: README,v 8.386 2005/03/04 23:24:08 ca Exp $
#
This directory contains the source files for sendmail(TM).
@@ -375,6 +375,9 @@
LA_DEVSHORT (13) reads a short from a system file (default:
/dev/table/avenrun) and scales it in the same manner
as LA_SHORT.
+ LA_LONGLONG (17) to read /dev/kmem for the symbol avenrun and
+ interpret as a long long integer (e.g., for 64 bit
+ systems).
LA_INT, LA_SHORT, LA_FLOAT, and LA_READKSYM have several
other parameters that they try to divine: the name of your
kernel, the name of the variable in the kernel to examine,
@@ -1823,4 +1826,4 @@
version.c The version number and information about this
version of sendmail.
-(Version $Revision: 8.385 $, last update $Date: 2004/11/25 06:52:06 $ )
+(Version $Revision: 8.386 $, last update $Date: 2005/03/04 23:24:08 $ )
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list