Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Apr 2005 23:19:02 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 75687 for review
Message-ID:  <200504212319.j3LNJ2M0062633@repoman.freebsd.org>

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

Change 75687 by marcel@marcel_nfs on 2005/04/21 23:18:39

	IFC @75684

Affected files ...

.. //depot/projects/ia64/UPDATING#77 integrate
.. //depot/projects/ia64/bin/hostname/hostname.1#6 integrate
.. //depot/projects/ia64/etc/Makefile#48 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#62 integrate
.. //depot/projects/ia64/etc/rc.d/Makefile#33 integrate
.. //depot/projects/ia64/etc/rc.d/bsnmpd#1 branch
.. //depot/projects/ia64/etc/snmpd.config#1 branch
.. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#26 integrate
.. //depot/projects/ia64/kerberos5/Makefile.inc#16 integrate
.. //depot/projects/ia64/lib/Makefile#53 integrate
.. //depot/projects/ia64/lib/libarchive/Makefile#13 integrate
.. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#10 integrate
.. //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#2 integrate
.. //depot/projects/ia64/lib/libc/gen/sysctl.3#14 integrate
.. //depot/projects/ia64/lib/libc/net/getnameinfo.c#7 integrate
.. //depot/projects/ia64/lib/libc/net/getproto.c#3 integrate
.. //depot/projects/ia64/lib/libc/net/getprotoent.c#4 integrate
.. //depot/projects/ia64/lib/libc/net/getprotoname.c#3 integrate
.. //depot/projects/ia64/lib/libc/net/getservbyname.c#4 integrate
.. //depot/projects/ia64/lib/libc/net/getservbyport.c#4 integrate
.. //depot/projects/ia64/lib/libc/net/getservent.c#8 integrate
.. //depot/projects/ia64/lib/libc/net/name6.c#16 integrate
.. //depot/projects/ia64/lib/libc/net/netdb_private.h#2 integrate
.. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#24 integrate
.. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#15 integrate
.. //depot/projects/ia64/lib/libpmc/Makefile#1 branch
.. //depot/projects/ia64/lib/libpmc/libpmc.c#1 branch
.. //depot/projects/ia64/lib/libpmc/pmc.3#1 branch
.. //depot/projects/ia64/lib/libpmc/pmc.h#1 branch
.. //depot/projects/ia64/lib/msun/Makefile#17 integrate
.. //depot/projects/ia64/libexec/rexecd/rexecd.c#9 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#38 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#6 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#6 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#18 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#150 integrate
.. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#10 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate
.. //depot/projects/ia64/release/scripts/package-split.py#2 integrate
.. //depot/projects/ia64/sbin/devd/devd.cc#14 integrate
.. //depot/projects/ia64/sbin/devfs/devfs.8#11 integrate
.. //depot/projects/ia64/sbin/dump/main.c#24 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw.8#43 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw2.c#44 integrate
.. //depot/projects/ia64/share/doc/papers/Makefile#5 integrate
.. //depot/projects/ia64/share/doc/papers/hwpmc/Makefile#1 branch
.. //depot/projects/ia64/share/doc/papers/hwpmc/hwpmc.ms#1 branch
.. //depot/projects/ia64/share/examples/hwpmc/README#1 branch
.. //depot/projects/ia64/share/examples/ppi/ppilcd.c#3 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#85 integrate
.. //depot/projects/ia64/share/man/man4/ataraid.4#2 integrate
.. //depot/projects/ia64/share/man/man4/cpufreq.4#3 integrate
.. //depot/projects/ia64/share/man/man4/faith.4#4 integrate
.. //depot/projects/ia64/share/man/man4/hwpmc.4#1 branch
.. //depot/projects/ia64/share/man/man4/ipw.4#1 branch
.. //depot/projects/ia64/share/man/man4/iwi.4#1 branch
.. //depot/projects/ia64/share/man/man4/ohci.4#5 integrate
.. //depot/projects/ia64/share/man/man4/ral.4#1 branch
.. //depot/projects/ia64/share/man/man4/twe.4#6 integrate
.. //depot/projects/ia64/share/man/man4/ucom.4#6 integrate
.. //depot/projects/ia64/share/man/man4/uhci.4#5 integrate
.. //depot/projects/ia64/share/man/man4/ural.4#1 branch
.. //depot/projects/ia64/share/man/man4/usb.4#13 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#63 integrate
.. //depot/projects/ia64/share/man/man9/Makefile#54 integrate
.. //depot/projects/ia64/share/man/man9/alloc_unr.9#1 branch
.. //depot/projects/ia64/share/man/man9/sleepqueue.9#6 integrate
.. //depot/projects/ia64/share/man/man9/taskqueue.9#10 integrate
.. //depot/projects/ia64/share/mk/bsd.libnames.mk#30 integrate
.. //depot/projects/ia64/share/mklocale/be_BY.CP1131.src#2 integrate
.. //depot/projects/ia64/sys/alpha/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/alpha/include/bus.h#19 integrate
.. //depot/projects/ia64/sys/alpha/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#19 integrate
.. //depot/projects/ia64/sys/amd64/conf/NOTES#10 integrate
.. //depot/projects/ia64/sys/amd64/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/amd64/include/bus.h#4 integrate
.. //depot/projects/ia64/sys/amd64/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/arm/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/arm/include/bus.h#7 integrate
.. //depot/projects/ia64/sys/arm/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/boot/i386/libi386/pxe.c#5 integrate
.. //depot/projects/ia64/sys/compat/ndis/kern_windrv.c#3 integrate
.. //depot/projects/ia64/sys/conf/NOTES#91 integrate
.. //depot/projects/ia64/sys/conf/files#130 integrate
.. //depot/projects/ia64/sys/conf/files.amd64#27 integrate
.. //depot/projects/ia64/sys/conf/files.i386#65 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#54 integrate
.. //depot/projects/ia64/sys/conf/kmod.mk#45 integrate
.. //depot/projects/ia64/sys/conf/options#85 integrate
.. //depot/projects/ia64/sys/ddb/ddb.h#12 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#16 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpivar.h#35 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#61 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.h#29 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#43 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-disk.c#41 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#30 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#28 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-queue.c#20 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-raid.c#32 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-raid.h#17 integrate
.. //depot/projects/ia64/sys/dev/ciss/ciss.c#38 integrate
.. //depot/projects/ia64/sys/dev/ciss/cissreg.h#8 integrate
.. //depot/projects/ia64/sys/dev/ciss/cissvar.h#8 integrate
.. //depot/projects/ia64/sys/dev/esp/esp_sbus.c#5 integrate
.. //depot/projects/ia64/sys/dev/esp/ncr53c9x.c#4 integrate
.. //depot/projects/ia64/sys/dev/esp/ncr53c9xreg.h#3 integrate
.. //depot/projects/ia64/sys/dev/esp/ncr53c9xvar.h#3 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#58 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#9 integrate
.. //depot/projects/ia64/sys/dev/fxp/rcvbundl.h#3 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#1 branch
.. //depot/projects/ia64/sys/dev/ipw/if_ipwreg.h#1 branch
.. //depot/projects/ia64/sys/dev/ipw/if_ipwvar.h#1 branch
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#1 branch
.. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#1 branch
.. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#1 branch
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs#47 integrate
.. //depot/projects/ia64/sys/dev/ral/if_ral.c#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ral_pccard.c#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ral_pci.c#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.c#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.h#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ralreg.h#1 branch
.. //depot/projects/ia64/sys/dev/ral/if_ralvar.h#1 branch
.. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#10 integrate
.. //depot/projects/ia64/sys/dev/usb/if_ural.c#1 branch
.. //depot/projects/ia64/sys/dev/usb/if_uralreg.h#1 branch
.. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#1 branch
.. //depot/projects/ia64/sys/dev/usb/usbdevs#68 integrate
.. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_lookup.c#10 integrate
.. //depot/projects/ia64/sys/geom/geom_kern.c#26 integrate
.. //depot/projects/ia64/sys/geom/label/g_label_ufs.c#3 integrate
.. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#12 integrate
.. //depot/projects/ia64/sys/geom/mirror/g_mirror.h#7 integrate
.. //depot/projects/ia64/sys/hwpmc/hwpmc_amd.c#1 branch
.. //depot/projects/ia64/sys/hwpmc/hwpmc_intel.c#1 branch
.. //depot/projects/ia64/sys/hwpmc/hwpmc_mod.c#1 branch
.. //depot/projects/ia64/sys/hwpmc/hwpmc_pentium.c#1 branch
.. //depot/projects/ia64/sys/hwpmc/hwpmc_piv.c#1 branch
.. //depot/projects/ia64/sys/hwpmc/hwpmc_ppro.c#1 branch
.. //depot/projects/ia64/sys/i386/conf/NOTES#65 integrate
.. //depot/projects/ia64/sys/i386/cpufreq/smist.c#1 branch
.. //depot/projects/ia64/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#30 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#46 integrate
.. //depot/projects/ia64/sys/i386/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/i386/include/bus.h#4 integrate
.. //depot/projects/ia64/sys/i386/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#89 integrate
.. //depot/projects/ia64/sys/ia64/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/ia64/include/bus.h#20 integrate
.. //depot/projects/ia64/sys/ia64/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/kern/kern_exec.c#74 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#63 integrate
.. //depot/projects/ia64/sys/kern/kern_fork.c#60 integrate
.. //depot/projects/ia64/sys/kern/kern_pmc.c#1 branch
.. //depot/projects/ia64/sys/kern/kern_proc.c#62 integrate
.. //depot/projects/ia64/sys/kern/kern_prot.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#83 integrate
.. //depot/projects/ia64/sys/kern/sched_4bsd.c#30 integrate
.. //depot/projects/ia64/sys/kern/sched_ule.c#43 integrate
.. //depot/projects/ia64/sys/kern/sysv_sem.c#24 integrate
.. //depot/projects/ia64/sys/kern/uipc_usrreq.c#40 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#42 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#79 integrate
.. //depot/projects/ia64/sys/modules/Makefile#85 integrate
.. //depot/projects/ia64/sys/modules/apm/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/cpufreq/Makefile#3 integrate
.. //depot/projects/ia64/sys/modules/hwpmc/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ipw/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/iwi/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ral/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ural/Makefile#1 branch
.. //depot/projects/ia64/sys/net/if.c#44 integrate
.. //depot/projects/ia64/sys/net/if_var.h#30 integrate
.. //depot/projects/ia64/sys/net/if_vlan.c#24 integrate
.. //depot/projects/ia64/sys/netgraph/ng_eiface.c#15 integrate
.. //depot/projects/ia64/sys/netgraph/ng_ksocket.c#18 integrate
.. //depot/projects/ia64/sys/netgraph/ng_message.h#10 integrate
.. //depot/projects/ia64/sys/netgraph/ng_vlan.c#3 integrate
.. //depot/projects/ia64/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/ia64/sys/netinet/ip_dummynet.c#36 integrate
.. //depot/projects/ia64/sys/netinet/ip_dummynet.h#15 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw.h#24 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#46 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#10 integrate
.. //depot/projects/ia64/sys/netinet/ip_icmp.c#25 integrate
.. //depot/projects/ia64/sys/netinet/ip_icmp.h#8 integrate
.. //depot/projects/ia64/sys/netinet/tcp_output.c#31 integrate
.. //depot/projects/ia64/sys/netinet/tcp_sack.c#8 integrate
.. //depot/projects/ia64/sys/netinet/tcp_subr.c#51 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#35 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#27 integrate
.. //depot/projects/ia64/sys/netinet6/ip6_output.c#28 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#27 integrate
.. //depot/projects/ia64/sys/nfsserver/nfs.h#12 integrate
.. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#34 integrate
.. //depot/projects/ia64/sys/pc98/apm/apm_bioscall.S#1 branch
.. //depot/projects/ia64/sys/pc98/apm/apm_bioscall.s#3 delete
.. //depot/projects/ia64/sys/pc98/conf/NOTES#27 integrate
.. //depot/projects/ia64/sys/pc98/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/pc98/include/bus.h#2 integrate
.. //depot/projects/ia64/sys/pc98/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/pci/if_dc.c#63 integrate
.. //depot/projects/ia64/sys/powerpc/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/powerpc/include/bus.h#16 integrate
.. //depot/projects/ia64/sys/powerpc/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/powerpc/powermac/ata_kauai.c#8 integrate
.. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#14 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#33 integrate
.. //depot/projects/ia64/sys/security/mac/mac_process.c#5 integrate
.. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#10 integrate
.. //depot/projects/ia64/sys/security/mac_test/mac_test.c#26 integrate
.. //depot/projects/ia64/sys/sparc64/include/_bus.h#1 branch
.. //depot/projects/ia64/sys/sparc64/include/bus.h#25 integrate
.. //depot/projects/ia64/sys/sparc64/include/pmc_mdep.h#1 branch
.. //depot/projects/ia64/sys/sparc64/sbus/lsi64854.c#3 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/lsi64854reg.h#2 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#25 integrate
.. //depot/projects/ia64/sys/sys/kdb.h#3 integrate
.. //depot/projects/ia64/sys/sys/kernel.h#25 integrate
.. //depot/projects/ia64/sys/sys/mac.h#30 integrate
.. //depot/projects/ia64/sys/sys/mac_policy.h#27 integrate
.. //depot/projects/ia64/sys/sys/param.h#66 integrate
.. //depot/projects/ia64/sys/sys/pmc.h#1 branch
.. //depot/projects/ia64/sys/sys/pmckern.h#1 branch
.. //depot/projects/ia64/sys/sys/proc.h#94 integrate
.. //depot/projects/ia64/sys/sys/sched.h#11 integrate
.. //depot/projects/ia64/sys/sys/sysctl.h#29 integrate
.. //depot/projects/ia64/sys/sys/systm.h#44 integrate
.. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest-2.sh#1 branch
.. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest-3.sh#1 branch
.. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest.sh#2 integrate
.. //depot/projects/ia64/tools/tools/nanobsd/make.conf#9 integrate
.. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#7 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#53 integrate
.. //depot/projects/ia64/usr.bin/tar/Makefile#7 integrate
.. //depot/projects/ia64/usr.bin/tar/bsdtar.1#8 integrate
.. //depot/projects/ia64/usr.bin/tar/bsdtar.c#8 integrate
.. //depot/projects/ia64/usr.bin/tar/bsdtar.h#5 integrate
.. //depot/projects/ia64/usr.bin/tar/bsdtar_platform.h#7 integrate
.. //depot/projects/ia64/usr.bin/tar/configure.ac.in#4 integrate
.. //depot/projects/ia64/usr.bin/tar/fts.c#4 integrate
.. //depot/projects/ia64/usr.bin/tar/read.c#7 integrate
.. //depot/projects/ia64/usr.bin/tar/util.c#4 integrate
.. //depot/projects/ia64/usr.bin/tar/write.c#7 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#71 integrate
.. //depot/projects/ia64/usr.sbin/faithd/ftp.c#4 integrate
.. //depot/projects/ia64/usr.sbin/pmccontrol/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/pmccontrol/pmccontrol.8#1 branch
.. //depot/projects/ia64/usr.sbin/pmccontrol/pmccontrol.c#1 branch
.. //depot/projects/ia64/usr.sbin/pmcstat/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.8#1 branch
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.c#1 branch

Differences ...

==== //depot/projects/ia64/UPDATING#77 (text+ko) ====

@@ -21,6 +21,12 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20050415:
+	The NO_MIXED_MODE kernel option has been removed from the i386
+	amd64 platforms as its use has been superceded by the new local
+	APIC timer code.  Any kernel config files containing this option
+	should be updated.
+
 20050227:
 	The on-disk format of LC_CTYPE files was changed to be machine
 	independent.  Please make sure NOT to use NO_CLEAN buildworld
@@ -325,4 +331,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $
+$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $

==== //depot/projects/ia64/bin/hostname/hostname.1#6 (text+ko) ====

@@ -27,9 +27,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $
 .\"
-.Dd April 28, 1995
+.Dd April 18, 2005
 .Dt HOSTNAME 1
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 The super-user can
 set the hostname by supplying an argument; this is usually done in the
 network initialization script
-.Pa /etc/rc.network ,
+.Pa /etc/rc.d/hostname ,
 normally run at boot
 time.
 This script uses the

==== //depot/projects/ia64/etc/Makefile#48 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -13,8 +13,8 @@
 	mac.conf motd netconfig network.subr networks newsyslog.conf \
 	pf.conf pf.os phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
-	rc.subr remote rpc services \
-	shells sysctl.conf syslog.conf usbd.conf \
+	rc.subr remote rpc services shells \
+	snmpd.config sysctl.conf syslog.conf usbd.conf \
 	etc.${MACHINE_ARCH}/ttys \
 	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
 	${.CURDIR}/../usr.bin/mail/misc/mail.rc \

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

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.247 2005/04/12 15:21:51 thomas Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -247,6 +247,12 @@
 nis_yppasswdd_enable="NO"	# Run rpc.yppasswdd at boot time (or NO).
 nis_yppasswdd_flags=""		# Flags to rpc.yppasswdd (if enabled).
 
+### SNMP daemon ###
+# Be sure to understand the security implications of running SNMP v1/v2
+# in your network.
+bsnmpd_enable="NO"		# Run the SNMP daemon (or NO).
+bsnmpd_flags=""			# Flags for bsnmpd.
+
 ### Network routing options: ###
 defaultrouter="NO"		# Set to default gateway (or NO).
 static_routes=""		# Set to static route list (or leave empty).

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

@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
 	apm apmd archdep atm1 atm2 atm3 \
-	bgfsck bootparams \
+	bgfsck bootparams bsnmpd \
 	ccd cleanvar cleartmp cron \
 	devd devfs dhclient \
 	dmesg dumpon \

==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#26 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.45 2005/01/25 09:37:37 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.47 2005/04/19 13:26:58 jkoshy Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -48,6 +48,7 @@
 .ds doc-str-Lb-libkiconv   Kernel side iconv library (libkiconv, \-lkiconv)
 .ds doc-str-Lb-libmd       Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
 .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
+.ds doc-str-Lb-libpmc      Performance Monitoring Counters API (libpmc, \-lpmc)
 .ds doc-str-Lb-librpcsvc   RPC Service Library (librpcsvc, \-lrpcsvc)
 .ds doc-str-Lb-libsdp      Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp)
 .ds doc-str-Lb-libthr      1:1 Threading Library (libthr, \-lthr)

==== //depot/projects/ia64/kerberos5/Makefile.inc#16 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $
 
 NO_LINT=
 
@@ -48,4 +48,4 @@
 .endfor
 .endfor
 
-.endif defined(SRCS)
+.endif # defined(SRCS)

==== //depot/projects/ia64/lib/Makefile#53 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $
+# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -31,7 +31,7 @@
 	${_libio} libipsec \
 	libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
-	${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
+	libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
 	${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
 	libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
 

==== //depot/projects/ia64/lib/libarchive/Makefile#13 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $
 
 #
 # Use "make distfile" to build a conventional tar.gz archive
@@ -7,7 +7,7 @@
 
 
 LIB=	archive
-VERSION=	1.02.016
+VERSION=	1.02.017
 ARCHIVE_API_FEATURE=	2
 ARCHIVE_API_VERSION=	1
 SHLIB_MAJOR=	${ARCHIVE_API_VERSION}
@@ -204,7 +204,7 @@
 	cat ${.CURDIR}/configure.ac.in |			\
 		sed 's/@VERSION@/${VERSION}/' |			\
 		cat > ${DIST_WORK_DIR}/configure.ac
-	(cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign)
+	(cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign)
 	(cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist)
 	mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR}
 	@echo ==================================================

==== //depot/projects/ia64/lib/libarchive/archive_read_extract.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $");
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_ACL_H
@@ -482,9 +482,9 @@
 		return (ARCHIVE_WARN);
 	}
 	r = archive_read_data_into_fd(a, fd);
+	close(fd);
 	extract->pst = NULL; /* Cached stat data no longer valid. */
 	r2 = restore_metadata(a, entry, flags);
-	close(fd);
 	return (err_combine(r, r2));
 }
 

==== //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#2 (text+ko) ====

@@ -38,7 +38,7 @@
 	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.14 2005/04/21 12:47:08 kan Exp $");
 
 #include "SYS.h"
 
@@ -55,7 +55,7 @@
 	pushq	%rax
 	call	PIC_PLT(CNAME(__error))
 	popq	%rcx
-	movq	%rcx,(%rax)
+	movl	%ecx,(%rax)
 	movq	$-1,%rax
 	movq	$-1,%rdx
 	ret

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

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $
 .\"
 .Dd January 23, 2001
 .Dt SYSCTL 3
@@ -436,14 +436,14 @@
 with which the system
 attempts to comply.
 .It Li KERN_PROC
-Return the entire process table, or a subset of it.
-An array of pairs of
+Return selected information about specific running processes.
+.Pp
+For the following names, an array of pairs of
 .Va struct proc
 followed by corresponding
 .Va struct eproc
 structures is returned,
 whose size depends on the current number of such objects in the system.
-The third and fourth level names are as follows:
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
 .It "Third level name	Fourth level is:"
 .It "KERN_PROC_ALL	None"
@@ -459,9 +459,15 @@
 follow each other.
 The total size of array is returned.
 It is also possible for a process to set its own process title this way.
+If the third level name is KERN_PROC_PATHNAME, the path of the
+process' text file is stored.
+For KERN_PROC_PATHNAME, a process ID of
+.Li -1
+implies the current process.
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
 .It Sy "Third level name	Fourth level is:"
 .It "KERN_PROC_ARGS	A process ID"
+.It "KERN_PROC_PATHNAME	A process ID"
 .El
 .It Li KERN_PROF
 Return profiling information about the kernel.

==== //depot/projects/ia64/lib/libc/net/getnameinfo.c#7 (text+ko) ====

@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.14 2003/05/01 19:03:14 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.16 2005/04/17 04:00:55 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -109,9 +109,6 @@
 	if (sa == NULL)
 		return EAI_FAIL;
 
-	if (sa->sa_len != salen)
-		return EAI_FAIL;
-
 	family = sa->sa_family;
 	for (i = 0; afdl[i].a_af; i++)
 		if (afdl[i].a_af == family) {

==== //depot/projects/ia64/lib/libc/net/getproto.c#3 (text+ko) ====

@@ -35,23 +35,33 @@
 static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.3 2002/03/21 18:49:23 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
 
 #include <netdb.h>
+#include "netdb_private.h"
 
-extern int _proto_stayopen;
+int
+getprotobynumber_r(int proto, struct protoent *pe, struct protoent_data *ped)
+{
+	int error;
+
+	setprotoent_r(ped->stayopen, ped);
+	while ((error = getprotoent_r(pe, ped)) == 0)
+		if (pe->p_proto == proto)
+			break;
+	if (!ped->stayopen)
+		endprotoent_r(ped);
+	return (error);
+}
 
 struct protoent *
-getprotobynumber(proto)
-	int proto;
+getprotobynumber(int proto)
 {
-	struct protoent *p;
+	struct protodata *pd;
 
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) )
-		if (p->p_proto == proto)
-			break;
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
+	if ((pd = __protodata_init()) == NULL)
+		return (NULL);
+	if (getprotobynumber_r(proto, &pd->proto, &pd->data) != 0)
+		return (NULL);
+	return (&pd->proto);
 }

==== //depot/projects/ia64/lib/libc/net/getprotoent.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.3 2005/01/03 11:07:45 sobomax Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -43,53 +43,101 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "namespace.h"
+#include "reentrant.h"
+#include "un-namespace.h"
+#include "netdb_private.h"
+
+static struct protodata protodata;
+static thread_key_t protodata_key;
+static once_t protodata_init_once = ONCE_INITIALIZER;
+static int protodata_thr_keycreated = 0;
+
+static void
+protoent_data_clear(struct protoent_data *ped)
+{
+	if (ped->fp) {
+		fclose(ped->fp);
+		ped->fp = NULL;
+	}
+}
+
+static void
+protodata_free(void *ptr)
+{
+	struct protodata *pd = ptr;
+
+	if (pd == NULL)
+		return;
+	protoent_data_clear(&pd->data);
+	free(pd);
+}
+
+static void
+protodata_keycreate(void)
+{
+	protodata_thr_keycreated =
+	    (thr_keycreate(&protodata_key, protodata_free) == 0);
+}
 
-#define	MAXALIASES	35
+struct protodata *
+__protodata_init(void)
+{
+	struct protodata *pd;
 
-static FILE *protof = NULL;
-static char line[BUFSIZ+1];
-static struct protoent proto;
-static char *proto_aliases[MAXALIASES];
-int _proto_stayopen;
+	if (thr_main() != 0)
+		return (&protodata);
+	if (thr_once(&protodata_init_once, protodata_keycreate) != 0 ||
+	    !protodata_thr_keycreated)
+		return (NULL);
+	if ((pd = thr_getspecific(protodata_key)) != NULL)
+		return (pd);
+	if ((pd = calloc(1, sizeof(*pd))) == NULL)
+		return (NULL);
+	if (thr_setspecific(protodata_key, pd) == 0)
+		return (pd);
+	free(pd);
+	return (NULL);
+}
 
 void
-setprotoent(f)
-	int f;
+setprotoent_r(int f, struct protoent_data *ped)
 {
-	if (protof == NULL)
-		protof = fopen(_PATH_PROTOCOLS, "r" );
+	if (ped->fp == NULL)
+		ped->fp = fopen(_PATH_PROTOCOLS, "r");
 	else
-		rewind(protof);
-	_proto_stayopen |= f;
+		rewind(ped->fp);
+	ped->stayopen |= f;
 }
 
 void
-endprotoent()
+endprotoent_r(struct protoent_data *ped)
 {
-	if (protof) {
-		fclose(protof);
-		protof = NULL;
+	if (ped->fp) {
+		fclose(ped->fp);
+		ped->fp = NULL;
 	}
-	_proto_stayopen = 0;
+	ped->stayopen = 0;
 }
 
-struct protoent *
-getprotoent()
+int
+getprotoent_r(struct protoent *pe, struct protoent_data *ped)
 {
 	char *p;
-	char *cp, **q;
+	char *cp, **q, *endp;
+	long l;
 
-	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
-		return (NULL);
+	if (ped->fp == NULL && (ped->fp = fopen(_PATH_PROTOCOLS, "r")) == NULL)
+		return (-1);
 again:
-	if ((p = fgets(line, BUFSIZ, protof)) == NULL)
-		return (NULL);
+	if ((p = fgets(ped->line, BUFSIZ, ped->fp)) == NULL)
+		return (-1);
 	if (*p == '#')
 		goto again;
 	cp = strpbrk(p, "#\n");
 	if (cp != NULL)
 		*cp = '\0';
-	proto.p_name = p;
+	pe->p_name = p;
 	cp = strpbrk(p, " \t");
 	if (cp == NULL)
 		goto again;
@@ -99,8 +147,11 @@
 	p = strpbrk(cp, " \t");
 	if (p != NULL)
 		*p++ = '\0';
-	proto.p_proto = atoi(cp);
-	q = proto.p_aliases = proto_aliases;
+	l = strtol(cp, &endp, 10);
+	if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX)
+		goto again;
+	pe->p_proto = l;
+	q = pe->p_aliases = ped->aliases;
 	if (p != NULL) {
 		cp = p;
 		while (cp && *cp) {
@@ -108,7 +159,7 @@
 				cp++;
 				continue;
 			}
-			if (q < &proto_aliases[MAXALIASES - 1])
+			if (q < &ped->aliases[PROTOENT_MAXALIASES - 1])
 				*q++ = cp;
 			cp = strpbrk(cp, " \t");
 			if (cp != NULL)
@@ -116,5 +167,37 @@
 		}
 	}
 	*q = NULL;
-	return (&proto);
+	return (0);
+}
+
+void
+setprotoent(int f)
+{
+	struct protodata *pd;
+
+	if ((pd = __protodata_init()) == NULL)
+		return;
+	setprotoent_r(f, &pd->data);
+}
+
+void
+endprotoent(void)
+{
+	struct protodata *pd;
+
+	if ((pd = __protodata_init()) == NULL)
+		return;
+	endprotoent_r(&pd->data);
+}
+
+struct protoent *
+getprotoent(void)
+{
+	struct protodata *pd;
+
+	if ((pd = __protodata_init()) == NULL)
+		return (NULL);
+	if (getprotoent_r(&pd->proto, &pd->data) != 0)
+		return (NULL);
+	return (&pd->proto);
 }

==== //depot/projects/ia64/lib/libc/net/getprotoname.c#3 (text+ko) ====

@@ -35,30 +35,41 @@
 static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.3 2002/03/21 18:49:23 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
+#include "netdb_private.h"
 
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobyname(name)
-	const char *name;
+int
+getprotobyname_r(const char *name, struct protoent *pe,
+    struct protoent_data *ped)
 {
-	struct protoent *p;
 	char **cp;
+	int error;
 
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) ) {
-		if (strcmp(p->p_name, name) == 0)
+	setprotoent_r(ped->stayopen, ped);
+	while ((error = getprotoent_r(pe, ped)) == 0) {
+		if (strcmp(pe->p_name, name) == 0)
 			break;
-		for (cp = p->p_aliases; *cp != 0; cp++)
+		for (cp = pe->p_aliases; *cp != 0; cp++)
 			if (strcmp(*cp, name) == 0)
 				goto found;
 	}
 found:
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
+	if (!ped->stayopen)
+		endprotoent_r(ped);
+	return (error);
+}
+
+struct protoent *
+getprotobyname(const char *name)
+{
+	struct protodata *pd;
+
+	if ((pd = __protodata_init()) == NULL)
+		return (NULL);
+	if (getprotobyname_r(name, &pd->proto, &pd->data) != 0)
+		return (NULL);
+	return (&pd->proto);
 }

==== //depot/projects/ia64/lib/libc/net/getservbyname.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.5 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
@@ -49,8 +49,8 @@
 	int error;
 
 #ifdef YP
-	sed->getservbyname_yp = (char *)name;
-	sed->getservbyproto_yp = (char *)proto;
+	sed->yp_name = (char *)name;
+	sed->yp_proto = (char *)proto;
 #endif
 
 	setservent_r(sed->stayopen, sed);
@@ -69,8 +69,8 @@
 		endservent_r(sed);
 
 #ifdef YP
-	sed->getservbyname_yp = NULL;
-	sed->getservbyproto_yp = NULL;
+	sed->yp_name = NULL;
+	sed->yp_proto = NULL;
 #endif
 
 	return (error);
@@ -81,7 +81,7 @@
 {
 	struct servdata *sd;
 
-	if ((sd = _servdata_init()) == NULL)
+	if ((sd = __servdata_init()) == NULL)
 		return (NULL);
 	if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0)
 		return (NULL);

==== //depot/projects/ia64/lib/libc/net/getservbyport.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.5 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
 
 #include <netdb.h>
 #include <string.h>
@@ -48,8 +48,8 @@
 	int error;
 
 #ifdef YP
-	sed->getservbyport_yp = port;
-	sed->getservbyproto_yp = (char *)proto;
+	sed->yp_port = port;
+	sed->yp_proto = (char *)proto;
 #endif
 
 	setservent_r(sed->stayopen, sed);
@@ -63,8 +63,8 @@
 		endservent_r(sed);
 
 #ifdef YP
-	sed->getservbyport_yp = 0;
-	sed->getservbyproto_yp = NULL;
+	sed->yp_port = 0;
+	sed->yp_proto = NULL;
 #endif
 
 	return (error);
@@ -75,7 +75,7 @@
 {
 	struct servdata *sd;
 
-	if ((sd = _servdata_init()) == NULL)
+	if ((sd = __servdata_init()) == NULL)
 		return (NULL);
 	if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0)
 		return (NULL);

==== //depot/projects/ia64/lib/libc/net/getservent.c#8 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.14 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.18 2005/04/18 18:34:58 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -66,10 +66,10 @@
 		fclose(sed->fp);
 		sed->fp = NULL;
 	}
-	if (sed->key) {
-		free(sed->key);
-		sed->key = NULL;
-	}
+#ifdef YP
+	free(sed->yp_key);
+	sed->yp_key = NULL;
+#endif
 }
 
 static void
@@ -91,7 +91,7 @@
 }
 
 struct servdata *
-_servdata_init(void)
+__servdata_init(void)
 {
 	struct servdata *sd;
 
@@ -119,11 +119,11 @@
 	char buf[YPMAXRECORD + 2];

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



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