PERFORCE change 127966 for review
Peter Wemm
peter at FreeBSD.org
Tue Oct 23 12:07:30 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127966
Change 127966 by peter at peter_daintree on 2007/10/23 19:06:32
IFC @@127960
Affected files ...
.. //depot/projects/hammer/ObsoleteFiles.inc#36 integrate
.. //depot/projects/hammer/UPDATING#108 integrate
.. //depot/projects/hammer/contrib/libpcap/pcap.h#8 integrate
.. //depot/projects/hammer/etc/rc.d/amd#13 integrate
.. //depot/projects/hammer/etc/rc.d/kerberos#6 integrate
.. //depot/projects/hammer/etc/rc.d/named#17 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#69 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#7 integrate
.. //depot/projects/hammer/games/fortune/datfiles/limerick#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#28 integrate
.. //depot/projects/hammer/lib/libbsm/Makefile#6 integrate
.. //depot/projects/hammer/lib/libc/locale/iswctype.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/atoi.3#4 integrate
.. //depot/projects/hammer/lib/libc/sys/kldstat.2#4 integrate
.. //depot/projects/hammer/lib/libelf/elf.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/hammer/lib/libelf/elf_update.3#3 integrate
.. //depot/projects/hammer/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/hammer/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/hammer/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#5 integrate
.. //depot/projects/hammer/lib/libstand/tftp.c#4 integrate
.. //depot/projects/hammer/lib/libthr/libthr.3#3 integrate
.. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#7 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 integrate
.. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/hammer/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#61 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#59 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.c#9 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#23 integrate
.. //depot/projects/hammer/share/man/man3/pthread.3#10 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr_get_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr_setcreatesuspend_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#6 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrierattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cancel.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_timedwait.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_create.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_detach.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_exit.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_join.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_lock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr_getkind_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_once.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_destroy.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_init.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_rdlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_unlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_wrlock.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_init.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_schedparam.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_setspecific.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_init.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_switch_add_np.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_testcancel.3#5 integrate
.. //depot/projects/hammer/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#10 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#13 integrate
.. //depot/projects/hammer/share/man/man9/kproc.9#1 branch
.. //depot/projects/hammer/share/man/man9/kthread.9#6 integrate
.. //depot/projects/hammer/share/mk/bsd.compat.mk#6 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#32 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#20 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#98 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#34 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#45 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#32 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#25 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#40 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#30 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#6 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#7 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#6 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#46 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#32 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#40 integrate
.. //depot/projects/hammer/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/entry.c#15 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#8 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#54 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#32 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#26 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#61 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#18 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#19 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#10 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#14 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#49 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/random/harvest.c#9 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#16 integrate
.. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/uipaq.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usb.c#21 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#22 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#88 integrate
.. //depot/projects/hammer/sys/dev/utopia/utopia.c#11 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#28 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#13 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#47 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#33 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde.c#13 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#15 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli.c#17 integrate
.. //depot/projects/hammer/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#36 integrate
.. //depot/projects/hammer/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#6 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#29 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#18 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#11 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#15 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#12 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.c#14 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#56 integrate
.. //depot/projects/hammer/sys/i386/i386/in_cksum.c#6 integrate
.. //depot/projects/hammer/sys/i386/include/in_cksum.h#6 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#64 integrate
.. //depot/projects/hammer/sys/kern/kern_idle.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#45 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#85 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#22 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#62 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#52 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#78 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#116 integrate
.. //depot/projects/hammer/sys/net/bpf.h#18 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#37 integrate
.. //depot/projects/hammer/sys/net/if_lagg.c#9 integrate
.. //depot/projects/hammer/sys/net/route.c#27 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#30 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#49 integrate
.. //depot/projects/hammer/sys/netgraph/ng_socket.c#27 integrate
.. //depot/projects/hammer/sys/netinet/ip.h#10 integrate
.. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#8 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#50 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#52 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#33 integrate
.. //depot/projects/hammer/sys/netsmb/smb_iod.c#10 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#22 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#15 integrate
.. //depot/projects/hammer/sys/opencrypto/crypto.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#33 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/swtch.S#6 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#30 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#5 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#6 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#4 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#43 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#41 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#25 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#43 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/hammer/sys/sys/apm.h#2 integrate
.. //depot/projects/hammer/sys/sys/gpt.h#7 integrate
.. //depot/projects/hammer/sys/sys/kthread.h#3 integrate
.. //depot/projects/hammer/sys/sys/linker.h#18 integrate
.. //depot/projects/hammer/sys/sys/param.h#94 integrate
.. //depot/projects/hammer/sys/sys/priv.h#6 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#72 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#45 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#64 integrate
.. //depot/projects/hammer/sys/vm/vm_zeroidle.c#29 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#41 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/hammer/usr.bin/lex/lib/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.8#12 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#13 integrate
.. //depot/projects/hammer/usr.sbin/adduser/rmuser.sh#5 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.8#9 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#21 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#9 integrate
Differences ...
==== //depot/projects/hammer/ObsoleteFiles.inc#36 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -579,11 +579,17 @@
# 20070201: remove libmytinfo link
OLD_FILES+=usr/lib/libmytinfo.a
OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
.if ${TARGET_ARCH} == "amd64"
OLD_FILES+=usr/lib32/libmytinfo.a
OLD_FILES+=usr/lib32/libmytinfo.so
OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
.endif
# 20070128: remove vnconfig
OLD_FILES+=usr/sbin/vnconfig
==== //depot/projects/hammer/UPDATING#108 (text+ko) ====
@@ -21,6 +21,14 @@
developers choose to disable these features on build machines
to maximize performance.
+20071020:
+ The misnamed kthread_create() and friends have been renamed
+ to kproc_create() etc. Many of the callers already
+ used kproc_start()..
+ I will return kthread_create() and friends in a while
+ with implementations that actually create threads, not procs.
+ Renaming corresponds with version 800002.
+
20071010:
RELENG_7 branched.
@@ -913,4 +921,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
==== //depot/projects/hammer/contrib/libpcap/pcap.h#8 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.13 2007/10/16 02:07:55 mlaier Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.14 2007/10/20 20:23:39 mlaier Exp $
* @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL)
*/
@@ -41,9 +41,7 @@
#include <sys/types.h>
#include <sys/time.h>
-#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include <pcap-bpf.h>
-#endif
+#include <net/bpf.h>
#include <stdio.h>
==== //depot/projects/hammer/etc/rc.d/amd#13 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $
#
# PROVIDE: amd
@@ -34,7 +34,7 @@
[Nn][Oo] | '')
;;
*)
- rc_flags="${rc_flags} `eval ${amd_map_program}`"
+ rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
;;
esac
@@ -46,7 +46,8 @@
fi
;;
*)
- rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
+ rc_flags="-p ${rc_flags}"
+ command_args=" > /var/run/amd.pid 2> /dev/null"
;;
esac
return 0
==== //depot/projects/hammer/etc/rc.d/kerberos#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/kerberos,v 1.6 2007/05/17 11:33:08 mtm Exp $
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.7 2007/10/19 08:59:59 mtm Exp $
#
# PROVIDE: kerberos
@@ -14,4 +14,5 @@
load_rc_config $name
command="${kerberos5_server}"
+kerberos5_flags="${kerberos5_server_flags}"
run_rc_command "$1"
==== //depot/projects/hammer/etc/rc.d/named#17 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $
#
# PROVIDE: named
@@ -82,20 +82,28 @@
named_reload()
{
- rndc reload
+ ${command%/named}/rndc reload
}
named_stop()
{
- echo -n "Stopping named"
- if rndc stop 2>/dev/null; then
- echo .
+ # This duplicates an undesirably large amount of code from the stop
+ # routine in rc.subr in order to use rndc to shut down the process,
+ # and to give it a second chance in case rndc fails.
+ rc_pid=$(check_pidfile $pidfile $command)
+ if [ -z "$rc_pid" ]; then
+ [ -n "$rc_fast" ] && return 0
+ _run_rc_notrunning
+ return 1
+ fi
+ echo 'Stopping named.'
+ if ${command%/named}/rndc stop 2>/dev/null; then
+ wait_for_pids $rc_pid
else
- echo -n ": rndc failed, trying killall: "
- if killall named; then
- echo .
- fi
- fi
+ echo -n 'rndc failed, trying kill: '
+ kill -TERM $rc_pid
+ wait_for_pids $rc_pid
+ fi
}
named_poststop()
@@ -121,13 +129,13 @@
if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
return 0
fi
- confgen_command="rndc-confgen -a -b256 -u $named_uid \
+ confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
-c ${named_chrootdir}/etc/namedb/rndc.key"
if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
- if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \
- "$named_uid" ]; then
- $confgen_command
- fi
+ case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+ root|$named_uid) ;;
+ *) $confgen_command ;;
+ esac
else
$confgen_command
fi
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#69 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241 2007/06/12 09:20:31 philip Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $
%
=======================================================================
@@ -48607,7 +48607,7 @@
went to several nightclubs, drank champagne, danced and had a glorious
evening. It had gotten quite late when she motioned for the pencil and drew
a picture of a four-poster bed. He was dumbfounded, and to this day has
-never be able to understand how she knew he was in the furniture business.
+never been able to understand how she knew he was in the furniture business.
%
The part of the world that people find most puzzling is the part called "Me".
%
@@ -57135,26 +57135,30 @@
Caaaall for Super Chicken!! (**bwuck-bwuck-bwuck-bwuck**)
Caaaall for Super Chicken!!
%
-When you get what you want in your struggle for self
-And the world makes you king for a day,
-Just go to a mirror and look at yourself
-And see what that man has to say.
- For it isn't your father or mother or wife
- Whose judgement upon you must pass;
- The fellow whose verdict counts most in your life
- Is the one staring back from the glass.
-Some people may think you a straight-shootin' chum
-And call you a wonderful guy,
-But the man in the glass says you're only a bum
-If you can't look him straight in the eye.
- He's the fellow to please, never mind all the rest,
- For he's with you clear up to the end,
- And you've passed your most dangerous, difficult test
- If the man in the glass is your friend.
-You may fool the whole world down the pathway of life
+When you get what you want in your struggle for pelf,
+And the world makes you King for a day,
+Then go to the mirror and look at yourself,
+And see what that guy has to say.
+ For it isn't your Father, or Mother, or Wife,
+ Who judgement upon you must pass.
+ The feller whose verdict counts most in your life
+ Is the guy staring back from the glass.
+He's the feller to please, never mind all the rest,
+For he's with you clear up to the end,
+And you've passed your most dangerous, difficult test
+If the guy in the glass is your friend.
+ You may be like Jack Horner and "chisel" a plum,
+ And think you're a wonderful guy,
+ But the man in the glass says you're only a bum
+ If you can't look him straight in the eye.
+You can fool the whole world down the pathway of years,
And get pats on the back as you pass,
But your final reward will be heartaches and tears
-If you've cheated the man in the glass.
+If you've cheated the guy in the glass.
+ -- "The Guy in the Glass"
+ Copyright 1934, Dale Wimbrow (1895-1954)
+ [Pelf is a Middle English word for wealth or riches,
+ especially when acquired dishonestly. Ed.]
%
When you go into court you are putting your fate into the hands of twelve
people who weren't smart enough to get out of jury duty.
==== //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#7 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.22 2007/03/29 08:08:34 kris Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.23 2007/10/21 05:16:52 dougb Exp $
My Favorite Drugs [Sung to My Favorite Things]
Reefers and roach clips and papers and rollers
Cocaine and procaine for twenty year molars
@@ -1737,20 +1737,6 @@
%
The other night I was having sex, but the girl hung up on me.
%
-The owner of a large furniture store in the mid-west arrived in France
-on a buying trip. As he was checking into a hotel he struck up an
-acquaintance with a beautiful young lady. However, she only spoke
-French and he only spoke English, so each couldn't understand a word
-the other spoke. He took out a pencil and a notebook and drew a
-picture of a taxi. She smiled, nodded her head and they went for a
-ride in the park. Later, he drew a picture of a table in a restaurant
-with a question mark and she nodded, so they went to dinner. After
-dinner he sketched two dancers and she was delighted. They went to
-several nightclubs, drank champagne, danced and had a glorious
-evening. It had gotten quite late when she motioned for the pencil and
-drew a picture of a four-poster bed. He was dumbfounded, and has never
-been able to understand how she knew he was in the furniture business.
-%
The problem with being best man at a wedding is that you never get a
chance to prove it.
%
==== //depot/projects/hammer/games/fortune/datfiles/limerick#8 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.11 2006/09/27 19:20:43 schweikh Exp $
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.12 2007/10/21 05:16:52 dougb Exp $
A bad little girl in Madrid,
A most reprehensible kid,
Told her Tante Louise
@@ -1171,7 +1171,7 @@
As he lovingly busses each table.
%
A worn-out young husband named Lehr
-Her daily his wife's plaintive prayer:
+Heard daily his wife's plaintive prayer:
"Slip on a sheath, quick,
Then slip your big dick
Between these lips covered with hair."
==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#28 (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.60 2007/10/15 08:06:42 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $
.\"
.\" %beginstrip%
.
@@ -48,6 +48,7 @@
.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx)
.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv)
+.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse)
.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
==== //depot/projects/hammer/lib/libbsm/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libbsm/Makefile,v 1.7 2007/05/21 02:49:03 deischen Exp $
+# $FreeBSD: src/lib/libbsm/Makefile,v 1.8 2007/10/19 10:37:34 rwatson Exp $
#
OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm
@@ -151,6 +151,8 @@
au_user.3 getauusernam.3 \
au_user.3 getauusernam_R.3 \
au_user.3 au_user_mask.3 \
- au_user.3 getfauditflags.3
+ au_user.3 getfauditflags.3 \
+ getaudit.2 getaudit_addr.2 \
+ setaudit.2 setaudit_addr.2
.include <bsd.lib.mk>
==== //depot/projects/hammer/lib/libc/locale/iswctype.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $");
#include <wctype.h>
@@ -61,7 +61,7 @@
iswascii(wc)
wint_t wc;
{
- return (wc < 0x80);
+ return ((wc & ~0x7F) == 0);
}
#undef iswblank
==== //depot/projects/hammer/lib/libc/stdlib/atoi.3#4 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)atoi.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.13 2007/01/09 00:28:09 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.14 2007/10/19 06:23:39 davidxu Exp $
.\"
.Dd June 4, 1993
.Dt ATOI 3
@@ -59,10 +59,6 @@
.Bd -literal -offset indent
(int)strtol(nptr, (char **)NULL, 10);
.Ed
-.Sh IMPLEMENTATION NOTES
-The
-.Fn atoi
-function is not thread-safe and also not async-cancel safe.
.Pp
The
.Fn atoi
==== //depot/projects/hammer/lib/libc/sys/kldstat.2#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $
.\"
.Dd March 3, 1999
.Dt KLDSTAT 2
@@ -53,6 +53,7 @@
int id;
caddr_t address; /* load address */
size_t size; /* size in bytes */
+ char pathname[MAXPATHLEN];
};
.Ed
.Pp
@@ -77,6 +78,10 @@
The load address of the kld file.
.It size
The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
.El
.Sh RETURN VALUES
.Rv -std kldstat
@@ -123,3 +128,7 @@
.Nm kld
interface first appeared in
.Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.
==== //depot/projects/hammer/lib/libelf/elf.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf.3,v 1.3 2006/12/11 09:03:27 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf.3,v 1.4 2007/10/21 05:08:40 jkoshy Exp $
.\"
-.Dd December 11, 2006
+.Dd October 21, 2007
.Os
.Dt ELF 3
.Sh NAME
@@ -521,6 +521,9 @@
.Xr elf_flagelf 3 ,
following which the library will use the data offsets and alignments
specified by the application when laying out the file.
+Application control of file layout is described further in the
+.Xr elf_update 3
+manual page.
.Pp
Gaps in between sections will be filled with the fill character
set by function
==== //depot/projects/hammer/lib/libelf/elf_flagdata.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd August 10, 2006
+.Dd October 22, 2007
.Os
.Dt ELF_FLAGDATA 3
.Sh NAME
@@ -51,7 +51,7 @@
.Ft "unsigned int"
.Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags"
.Sh DESCRIPTION
-These functions are used to query, set or reset flag bits on data
+These functions are used to query, set or reset flags on data
structures associated with an ELF file.
.Pp
Arguments
@@ -59,7 +59,7 @@
.Ar elf
and
.Ar scn
-denote the data structures whose status bits need to be changed.
+denote the data structures whose flags need to be changed.
These values are allowed to be NULL to simplify error handling in
application code.
.Pp
@@ -70,16 +70,16 @@
.It Dv ELF_C_CLR
The argument
.Ar flags
-specifies the bits to be cleared.
+specifies the flags to be cleared.
.It Dv ELF_C_SET
The argument
.Ar flags
-specifies the bits to be set.
+specifies the flags to be set.
.El
.Pp
The argument
.Ar flags
-is allowed to have the following bits set:
+is allowed to have the following flags set:
.Bl -tag -width ELF_F_LAYOUT
.It Dv ELF_F_DIRTY
Mark the associated data structure as needing to be written back
@@ -111,7 +111,7 @@
will return the current set of flags for the data structure being
queried.
.Sh RETURN VALUES
-These functions return the updated bits is successful, and zero if
+These functions return the updated flags is successful, and zero if
an error is detected.
.Sh ERRORS
These functions may fail with the following errors:
@@ -123,7 +123,7 @@
.It Bq Er ELF_E_ARGUMENT
Argument
.Ar flags
-had unsupported flag bits set.
+had unsupported flags set.
.It Bq Er ELF_E_ARGUMENT
The argument
.Ar elf
==== //depot/projects/hammer/lib/libelf/elf_getscn.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd August 26, 2006
+.Dd October 22, 2007
.Os
.Dt ELF_GETSCN 3
.Sh NAME
@@ -73,7 +73,7 @@
.Ar elf ,
and will set the
.Dv ELF_F_DIRTY
-bit for the new section.
+flag on the returned section descriptor.
For ELF descriptors opened for writing, the ELF library will
automatically create an empty section at index zero
.Dv ( SHN_UNDEF )
==== //depot/projects/hammer/lib/libelf/elf_update.3#3 (text+ko) ====
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.5 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd September 08, 2007
+.Dd October 22, 2007
.Os
.Dt ELF_UPDATE 3
.Sh NAME
@@ -63,7 +63,7 @@
.Dv ELF_F_LAYOUT
flag has been set on the ELF descriptor, the application assumes full
responsibility for the layout of the ELF object.
-If this bit is not set, the ELF library will compute the layout of the
+If this flag is not set, the ELF library will compute the layout of the
file from its associated section descriptors.
.Pp
It is the application's responsibility to manage the the following
==== //depot/projects/hammer/lib/libelf/gelf_getphdr.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.4 2007/10/21 05:15:07 jkoshy Exp $
.\"
-.Dd December 16, 2006
+.Dd October 21, 2007
.Os
.Dt GELF_GETPHDR 3
.Sh NAME
@@ -57,10 +57,9 @@
descriptors respectively.
These descriptors are described in
.Xr elf 5 .
-The number of entries in this array is specified by the
-.Va e_phnum
-field of the executable header for ELF descriptor
-.Ar elf .
+The number of entries in this array may be determined using the
+.Xr elf_getphnum 3
+function.
.Pp
Function
.Fn gelf_getphdr
@@ -134,6 +133,7 @@
.Xr elf64_getehdr 3 ,
.Xr elf64_newphdr 3 ,
.Xr elf_flagphdr 3 ,
+.Xr elf_getphnum 3 ,
.Xr gelf 3 ,
.Xr gelf_getehdr 3 ,
.Xr gelf_newphdr 3 ,
==== //depot/projects/hammer/lib/libelf/gelf_newehdr.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd December 16, 2006
+.Dd October 22, 2007
.Os
.Dt GELF_NEWEHDR 3
.Sh NAME
@@ -122,7 +122,7 @@
.Pp
If successful, these three functions set the
.Dv ELF_F_DIRTY
-bit on ELF descriptor
+flag on ELF descriptor
.Ar elf .
.Sh RETURN VALUES
These functions return a pointer to a translated header descriptor
==== //depot/projects/hammer/lib/libelf/gelf_newphdr.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd August 25, 2006
+.Dd October 22, 2007
.Os
.Dt GELF_NEWPHDR 3
.Sh NAME
@@ -81,14 +81,8 @@
.Ar elf .
.Pp
The functions set the
-.Va e_phnum
-field of the executable header for ELF descriptor
-.Ar elf
-to
-.Ar count ,
-and also set the
.Dv ELF_F_DIRTY
-bit on the program header table.
+flag on the program header table.
All members of the returned array of Phdr structures
will be initialized to zero.
.Pp
@@ -132,6 +126,7 @@
.Xr elf64_getphdr 3 ,
.Xr elf64_newehdr 3 ,
.Xr elf_flagphdr 3 ,
+.Xr elf_getphnum 3 ,
.Xr gelf 3 ,
.Xr gelf_getphdr 3 ,
.Xr gelf_newehdr 3 ,
==== //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#5 (text+ko) ====
@@ -32,9 +32,10 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.21 2006/03/19 08:52:49 ru Exp $
+# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.22 2007/10/20 19:01:50 ru Exp $
NO_PROFILE=
+NO_INSTALLLIB=
.include <bsd.own.mk>
LIB= pam_unix
==== //depot/projects/hammer/lib/libstand/tftp.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.12 2004/10/03 15:58:20 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.13 2007/10/21 17:03:18 marius Exp $");
/*
* Simple TFTP implementation for libsa.
@@ -95,10 +95,10 @@
u_char header[HEADER_SIZE];
struct tftphdr t;
u_char space[RSPACE];
- } lastdata;
+ } __packed __aligned(4) lastdata;
};
-static int tftperrors[8] = {
+static const int tftperrors[8] = {
0, /* ??? */
ENOENT,
EPERM,
@@ -175,7 +175,7 @@
u_char header[HEADER_SIZE];
struct tftphdr t;
u_char space[FNAME_SIZE + 6];
- } wbuf;
+ } __packed __aligned(4) wbuf;
char *wtail;
int l;
ssize_t res;
@@ -218,7 +218,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list