PERFORCE change 20644 for review
Robert Watson
rwatson at freebsd.org
Mon Nov 4 14:22:15 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=20644
Change 20644 by rwatson at rwatson_tislabs on 2002/11/04 06:21:33
Integ TrustedBSD MAC branch from TrustedBSD base branch. Loop
back various MAC system changes, also, gbde fixups, sysinstall
cleanup, ACL changes, etc. Don't integ the mac_execve rename
yet.
Affected files ...
.. //depot/projects/trustedbsd/mac/Makefile.inc1#28 integrate
.. //depot/projects/trustedbsd/mac/UPDATING#21 integrate
.. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#8 integrate
.. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#3 integrate
.. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.1#13 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/print.c#13 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/extern.h#12 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/nlist.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/print.c#17 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#3 integrate
.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#18 integrate
.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#7 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#5 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/root#5 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.network#14 integrate
.. //depot/projects/trustedbsd/mac/kerberos5/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/infinity.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/infinity.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/infinity.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/include/reentrant.h#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/infinity.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwscanf.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/kqueue.2#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/pathconf.2#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mutex.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/blocks.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#15 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/rules.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/tst01.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_sparc64_disk.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#7 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile#32 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#6 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/early-adopter/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#9 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/readme/article.sgml#6 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#10 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/install.sgml#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#43 integrate
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#1 branch
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#5 integrate
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#4 integrate
.. //depot/projects/trustedbsd/mac/release/ia64/boot_crunch.conf#1 branch
.. //depot/projects/trustedbsd/mac/release/ia64/dokern.sh#1 branch
.. //depot/projects/trustedbsd/mac/release/ia64/mkisoimages.sh#1 branch
.. //depot/projects/trustedbsd/mac/release/pc98/dokern.sh#4 integrate
.. //depot/projects/trustedbsd/mac/release/pc98/drivers-small.conf#2 integrate
.. //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#6 integrate
.. //depot/projects/trustedbsd/mac/release/sparc64/boot_crunch.conf#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck/fsck.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/gbde/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.8#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/mca/mca.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/newfs_msdos/newfs_msdos.c#5 integrate
.. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#15 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#20 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/atapicam.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/gbde.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_source.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/ohci.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/udbp.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/uhci.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ukbd.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/umass.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ums.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/usb.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#14 integrate
.. //depot/projects/trustedbsd/mac/share/man/man7/clocks.7#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man9/style.9#15 integrate
.. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#8 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#16 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#16 integrate
.. //depot/projects/trustedbsd/mac/sys/crypto/sha2/sha2.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_acad.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cmbat.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_cam.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_compat.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_disk.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_pci.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_tables.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amrio.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amrreg.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/amr/amrvar.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/eisa/eisaconf.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/card_if.m#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pci/isa_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_crypt.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_lock.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_work.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_gpt.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#29 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/spkr.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia32/syscalls.master#9 integrate
.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#43 edit
.. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#348 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#43 edit
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#40 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#42 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#50 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/aicasm/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/atspeaker/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/firewire/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/isp/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/mpt/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/netgraph/source/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/pcspeaker/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_source.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_source.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsubs.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfsm_subs.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/spkr.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#177 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#13 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#62 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#140 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#100 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#76 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/_label.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/gpt.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#208 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#164 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/malloc.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/param.h#16 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#26 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#43 edit
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#42 edit
.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#44 edit
.. //depot/projects/trustedbsd/mac/sys/sys/time.h#9 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/uma_int.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#14 integrate
.. //depot/projects/trustedbsd/mac/tools/KSE/ksetest/simplelock.h#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#17 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.holiday#6 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/finger/finger.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/make/make.1#9 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/mkstr/mkstr.1#4 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/mkstr/mkstr.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/uudecode/uudecode.c#12 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/uuidgen/uuidgen.1#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/uuidgen/uuidgen.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xinstall/install.1#4 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xinstall/xinstall.c#9 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xstr/xstr.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#20 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/command.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/http.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#8 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/media.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#15 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/network.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/nfs.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/sysinstall.h#9 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tape.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/variable.c#2 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/Makefile.inc1#28 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.309 2002/10/28 08:44:59 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $
#
# Make command line options:
# -DMAKE_KERBEROS4 to build KerberosIV
@@ -492,12 +492,21 @@
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules)
+ cd ${KRNLOBJDIR}/${_kernel}; \
+ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} modules-obj
+ cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \
+ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
+ ${MAKE} -DNO_CPU_CFLAGS depend; \
+ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
+ ${MAKE} -DNO_CPU_CFLAGS all
+.endif
.if !defined(NO_KERNELDEPEND)
cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend
+ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ
.endif
cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all
+ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ
@echo "--------------------------------------------------------------"
@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@@ -608,6 +617,10 @@
#
# build-tools: Build special purpose build tools
#
+.if defined(MODULES_WITH_WORLD) && exists(${KRNLSRCDIR}/modules)
+_aicasm= sys/modules/aic7xxx/aicasm
+.endif
+
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
_share= share/syscons/scrnmaps
.endif
@@ -630,7 +643,7 @@
build-tools:
.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \
${_libroken4} ${_libkrb5} lib/libncurses ${_share} \
- usr.bin/awk usr.bin/file usr.sbin/sysinstall
+ ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall
${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools
.endfor
==== //depot/projects/trustedbsd/mac/UPDATING#21 (text+ko) ====
@@ -1094,15 +1094,13 @@
install) after the buildworld before this step if you last updated
from current before 20020224 or from -stable before 20020408.
- [6] 4.x boot blocks can be used to boot a 5.x system, however
- it is difficult to do that at best. If you are concerned
- about being able to boot 4.x if the reboot to single user
- fails, then you should do something like
- mv /boot /boot-4x
- mkdir /boot
- before this step. You may be able to then boot the 4.x boot
- blocks if you catch boot2, and enter /boot-4x/loader rather than
- /boot/loader. However, this step hasn't been torture tested.
+ [6] 4.x boot loader can be used to boot a 5.x system, however
+ it is difficult to do that at best. If you wish to try, then
+ you should interrupt the boot and at the ok prompt type:
+ ok unload
+ ok boot /boot/kernel/kernel
+ If this fails to work, you must install a new boot loader as
+ described here.
[7] Before you upgrade, please make sure that you are not using
compatibility slices. These are device names of the form, on i386
@@ -1151,4 +1149,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.227 2002/10/29 16:46:52 fenner Exp $
+$FreeBSD: src/UPDATING,v 1.228 2002/10/30 20:11:07 imp Exp $
==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#8 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chmod.1 8.4 (Berkeley) 3/31/94
-.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.33 2002/10/01 20:32:59 trhodes Exp $
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.34 2002/11/04 06:46:53 tjr Exp $
.\"
.Dd March 31, 1994
.Dt CHMOD 1
@@ -315,6 +315,7 @@
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr install 1 ,
+.Xr setfacl 1 ,
.Xr chmod 2 ,
.Xr stat 2 ,
.Xr umask 2 ,
==== //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#3 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.4 2001/11/16 15:59:46 rwatson Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $
.\"
.\" Developed by the TrustedBSD Project.
.\" Support for POSIX.1e access control lists.
@@ -89,6 +89,8 @@
Retrieve the default ACL for the directory
.Pa / ,
if any.
+.Sh DIAGNOSTICS
+.Ex -std
.Sh SEE ALSO
.Xr setfacl 1 ,
.Xr acl 3 ,
==== //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.7 2002/06/30 05:13:53 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -156,7 +156,7 @@
error = stat(path, &sb);
if (error == -1) {
- perror(path);
+ warn("%s", path);
return(-1);
}
@@ -178,14 +178,14 @@
return(0);
acl = acl_from_stat(sb);
if (!acl) {
- perror("acl_from_stat()");
+ warn("acl_from_stat()");
return(-1);
}
}
acl_text = acl_to_text(acl, 0);
if (!acl_text) {
- perror(path);
+ warn("%s", path);
return(-1);
}
@@ -200,13 +200,12 @@
static int
print_acl_from_stdin(acl_type_t type)
{
- char pathname[PATH_MAX];
+ char *p, pathname[PATH_MAX];
int carried_error = 0;
- pathname[sizeof(pathname) - 1] = '\0';
while (fgets(pathname, (int)sizeof(pathname), stdin)) {
- /* remove the \n */
- pathname[strlen(pathname) - 1] = '\0';
+ if ((p = strchr(pathname, '\n')) != NULL)
+ *p = '\0';
if (print_acl(pathname, type) == -1) {
carried_error = -1;
}
@@ -236,7 +235,7 @@
if (argc == 0) {
error = print_acl_from_stdin(type);
- return(error);
+ return(error ? 1 : 0);
}
for (i = 0; i < argc; i++) {
@@ -251,5 +250,5 @@
}
}
- return(carried_error);
+ return(carried_error ? 1 : 0);
}
==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#13 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.70 2002/10/24 00:07:30 rwatson Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.71 2002/11/03 07:29:08 tjr Exp $
.\"
.Dd May 19, 2002
.Dt LS 1
@@ -417,6 +417,20 @@
.Xr sticky 8 . )
.El
.El
+.Pp
+The next field contains a
+plus
+.Pq Sq Li +
+character if the file has an ACL, or a
+space
+.Pq Sq Li " "
+if it does not.
+The
+.Nm
+utility does not show the actual ACL;
+use
+.Xr getfacl 1
+to do this.
.Sh EXAMPLES
The following is how to do an
.Nm
@@ -618,21 +632,25 @@
files in order to be compatible with the
.St -p1003.2
specification.
-KLD
-.El
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr chmod 1 ,
+.Xr getfacl 1 ,
.Xr sort 1 ,
.Xr xterm 1 ,
.Xr termcap 5 ,
.Xr symlink 7 ,
+.Xr getfmac 8 ,
.Xr sticky 8
.Sh STANDARDS
The
.Nm
utility conforms to
.St -p1003.1-2001 .
+.Pp
+.No The ACL support is compatible with IEEE\ Std\ 1003.2c\ ( Ns Dq "POSIX.2c" Ns )
+Draft\ 17
+(withdrawn).
.Sh HISTORY
An
.Nm
==== //depot/projects/trustedbsd/mac/bin/ls/print.c#13 (text+ko) ====
@@ -40,10 +40,11 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.61 2002/10/24 00:07:30 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.62 2002/11/03 07:29:08 tjr Exp $");
#include <sys/param.h>
#include <sys/stat.h>
+#include <sys/acl.h>
#include <err.h>
#include <errno.h>
@@ -73,6 +74,7 @@
static void endcolor(int);
static int colortype(mode_t);
#endif
+static void aclmode(char *, FTSENT *, int *);
#define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT)
@@ -162,10 +164,14 @@
#ifdef COLORLS
int color_printed = 0;
#endif
+ int haveacls;
+ dev_t prevdev;
if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
+ haveacls = 1;
+ prevdev = (dev_t)-1;
for (p = dp->list; p; p = p->fts_link) {
if (IS_NOPRINT(p))
continue;
@@ -176,6 +182,14 @@
(void)printf("%*lld ",
dp->s_block, howmany(sp->st_blocks, blocksize));
strmode(sp->st_mode, buf);
+ /*
+ * Cache whether or not the filesystem supports ACL's to
+ * avoid expensive syscalls. Try again when we change devices.
+ */
+ if (haveacls || sp->st_dev != prevdev) {
+ aclmode(buf, p, &haveacls);
+ prevdev = sp->st_dev;
+ }
np = p->fts_pointer;
(void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink,
sp->st_nlink, dp->s_user, np->user, dp->s_group,
@@ -644,3 +658,42 @@
return (unit);
}
+
+static void
+aclmode(char *buf, FTSENT *p, int *haveacls)
+{
+ char name[MAXPATHLEN + 1];
+ int entries, ret;
+ acl_t facl;
+ acl_entry_t ae;
+
+ /*
+ * Add a + after the standard rwxrwxrwx mode if the file has an
+ * extended ACL. strmode() reserves space at the end of the string.
+ */
+ if (p->fts_level == FTS_ROOTLEVEL)
+ snprintf(name, sizeof(name), "%s", p->fts_name);
+ else
+ snprintf(name, sizeof(name), "%s/%s",
+ p->fts_parent->fts_accpath, p->fts_name);
+ if ((ret = pathconf(name, _PC_ACL_EXTENDED)) <= 0) {
+ if (ret < 0 && errno != EINVAL)
+ warn("%s", name);
+ else
+ *haveacls = 0;
+ return;
+ }
+ *haveacls = 1;
+ if ((facl = acl_get_file(name, ACL_TYPE_ACCESS)) != NULL) {
+ if (acl_get_entry(facl, ACL_FIRST_ENTRY, &ae) == 1) {
+ entries = 0;
+ do
+ entries++;
+ while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1);
+ if (entries != 3)
+ buf[10] = '+';
+ }
+ acl_free(facl);
+ } else
+ warn("%s", name);
+}
==== //depot/projects/trustedbsd/mac/bin/ps/extern.h#12 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.28 2002/10/24 00:00:57 rwatson Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.29 2002/11/01 23:26:20 tmm Exp $
*/
struct kinfo;
@@ -40,7 +40,8 @@
struct varent;
extern fixpt_t ccpu;
-extern int cflag, eval, fscale, mempages, nlistread, rawcpu;
+extern int cflag, eval, fscale, nlistread, rawcpu;
+extern unsigned long mempages;
extern time_t now;
extern int sumrusage, termwidth, totwidth;
extern VARENT *vhead;
==== //depot/projects/trustedbsd/mac/bin/ps/nlist.c#5 (text+ko) ====
@@ -37,7 +37,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.18 2002/06/30 05:15:02 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.19 2002/11/01 23:26:20 tmm Exp $");
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -48,7 +48,7 @@
fixpt_t ccpu; /* kernel _ccpu variable */
int nlistread; /* if nlist already read. */
-int mempages; /* number of pages of phys. memory */
+unsigned long mempages; /* number of pages of phys. memory */
int fscale; /* kernel _fscale variable */
int
==== //depot/projects/trustedbsd/mac/bin/ps/print.c#17 (text+ko) ====
@@ -37,7 +37,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.75 2002/10/24 00:00:57 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.76 2002/10/31 13:41:37 tjr Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -72,7 +72,16 @@
{
VAR *v;
struct varent *vent;
+ int allempty;
+ allempty = 1;
+ for (vent = vhead; vent; vent = vent->next)
+ if (*vent->var->header != '\0') {
+ allempty = 0;
+ break;
+ }
+ if (allempty)
+ return;
for (vent = vhead; vent; vent = vent->next) {
v = vent->var;
if (v->flag & LJUST) {
==== //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#3 (text+ko) ====
@@ -15,9 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -33,7 +30,7 @@
*/
#include "includes.h"
-RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.5 2002/10/29 10:16:01 des Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.6 2002/11/02 19:55:23 des Exp $");
#ifdef USE_PAM
#include <security/pam_appl.h>
==== //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#18 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.159 2002/09/05 20:14:40 gordon Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.160 2002/11/02 08:21:25 ume Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -311,6 +311,9 @@
ipv6_firewall_quiet="NO" # Set to YES to suppress rule display
ipv6_firewall_logging="NO" # Set to YES to enable events logging
ipv6_firewall_flags="" # Flags passed to ip6fw when type is a file
+ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter,
+ # see /usr/src/contrib/ipfilter/rules
+ # for examples
##############################################################
### System console options #################################
==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.66 2002/10/20 11:18:56 markm Exp $
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.67 2002/11/04 07:50:48 markm Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -35,6 +35,9 @@
..
empty mode=0555 flags=schg
..
+/set gname=games mode=0775
+ games
+ ..
/set gname=wheel mode=0755
heimdal mode=0700
..
==== //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.4 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.5 2002/11/02 08:21:25 ume Exp $
#
# PROVIDE: ipfilter
@@ -16,7 +16,7 @@
case ${OSTYPE} in
FreeBSD)
- stop_precmd="test -f ${ipfilter_rules}"
+ stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}"
;;
NetBSD)
stop_precmd="test -f /etc/ipf.conf -o -f /etc/ipf6.conf"
@@ -49,7 +49,8 @@
fi
# check for ipfilter rules
- if [ ! -r "${ipfilter_rules}" ]; then
+ if [ ! -r "${ipfilter_rules}" ] && [ ! -r "${ipv6_ipfilter_rules}" ]
+ then
warn 'IP-filter: NO IPF RULES'
return 1
fi
@@ -78,8 +79,15 @@
echo "Enabling ipfilter."
case ${OSTYPE} in
FreeBSD)
- ${ipfilter_program:-/sbin/ipf} -Fa -f \
- "${ipfilter_rules}" ${ipfilter_flags}
+ ${ipfilter_program:-/sbin/ipf} -Fa
+ if [ -r "${ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} \
+ -f "${ipfilter_rules}" ${ipfilter_flags}
+ fi
+ if [ -r "${ipv6_ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} -6 \
+ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
+ fi
;;
NetBSD)
/sbin/ipf -E -Fa
@@ -114,8 +122,15 @@
case ${OSTYPE} in
FreeBSD)
- ${ipfilter_program:-/sbin/ipf} -I -Fa -f \
- "${ipfilter_rules}" ${ipfilter_flags}
+ ${ipfilter_program:-/sbin/ipf} -I -Fa
+ if [ -r "${ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} -I \
+ -f "${ipfilter_rules}" ${ipfilter_flags}
+ fi
+ if [ -r "${ipv6_ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} -I -6 \
+ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
+ fi
;;
NetBSD)
/sbin/ipf -I -Fa
==== //depot/projects/trustedbsd/mac/etc/rc.d/root#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $
-# $FreeBSD: src/etc/rc.d/root,v 1.4 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/root,v 1.5 2002/10/31 02:06:05 gordon Exp $
#
# PROVIDE: root
@@ -37,7 +37,9 @@
# If we booted a special kernel remove the record
# so we will boot the default kernel next time.
- [ -e /boot/nextkernel ] && rm -f /boot/nextkernel
+ if [ -e /boot/nextkernel ]; then
+ rm -f /boot/nextkernel
+ fi
;;
NetBSD)
umount -a >/dev/null 2>&1
==== //depot/projects/trustedbsd/mac/etc/rc.network#14 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.network,v 1.137 2002/09/20 18:31:55 ume Exp $
+# $FreeBSD: src/etc/rc.network,v 1.138 2002/11/02 08:21:26 ume Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
#
@@ -101,10 +101,20 @@
esac
case "${ipfilter_enable}" in
[Yy][Ee][Ss])
- if [ -r "${ipfilter_rules}" ]; then
+ if [ -r "${ipfilter_rules}" -o \
+ -r "${ipv6_ipfilter_rules}" ]; then
echo -n ' ipfilter'
- ${ipfilter_program:-/sbin/ipf} -Fa -f \
- "${ipfilter_rules}" ${ipfilter_flags}
+ ${ipfilter_program:-/sbin/ipf} -Fa
+ if [ -r "${ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} \
+ -f "${ipfilter_rules}" \
+ ${ipfilter_flags}
+ fi
+ if [ -r "${ipv6_ipfilter_rules}" ]; then
+ ${ipfilter_program:-/sbin/ipf} -6 \
+ -f "${ipv6_ipfilter_rules}" \
+ ${ipfilter_flags}
+ fi
else
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
==== //depot/projects/trustedbsd/mac/kerberos5/Makefile#6 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/kerberos5/Makefile,v 1.12 2002/10/30 14:27:12 des Exp $
+# $FreeBSD: src/kerberos5/Makefile,v 1.13 2002/10/30 20:33:28 jhb Exp $
SUBDIR= doc lib libexec usr.bin usr.sbin
# These are the programs which depend on Kerberos.
-KPROGS= lib/libpam lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
+KPROGS= lib/libpam secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
# This target is used to rebuild these programs WITH Kerberos.
kerberize:
==== //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/infinity.c#3 (text+ko) ====
@@ -28,9 +28,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/infinity.c,v 1.5 2002/09/20 15:43:20 archie Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/infinity.c,v 1.6 2002/10/31 23:05:19 archie Exp $");
#include <math.h>
/* bytes for +Infinity on an Alpha (IEEE double format) */
-char __infinity[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
+const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
==== //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#4 (text+ko) ====
@@ -25,12 +25,15 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.7 2002/09/19 01:09:49 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $");
#include <signal.h>
#include <pthread.h>
#include <pthread_np.h>
+void *_pthread_getspecific(pthread_key_t key);
+pthread_t _pthread_self(void);
+
/*
* Weak symbols: All libc internal usage of these functions should
* use the weak symbol versions (_pthread_XXX). If libpthread is
@@ -39,9 +42,15 @@
* usage to avoid unwanted cancellation points and to differentiate
* between application locks and libc locks (threads holding the
* latter can't be allowed to exit/terminate).
+ *
+ * We also provide weak pthread_XXX stubs which call their
+ * _pthread_XXX counterparts. These stubs may be used be other
+ * libraries for ensuring thread-safety without requiring the presence
+ * of a thread library.
*/
__weak_reference(_pthread_cond_init_stub, _pthread_cond_init);
__weak_reference(_pthread_cond_signal_stub, _pthread_cond_signal);
+__weak_reference(_pthread_cond_broadcast_stub, _pthread_cond_broadcast);
__weak_reference(_pthread_cond_wait_stub, _pthread_cond_wait);
__weak_reference(_pthread_cond_destroy_stub, _pthread_cond_destroy);
__weak_reference(_pthread_getspecific_stub, _pthread_getspecific);
@@ -59,180 +68,386 @@
__weak_reference(_pthread_once_stub, _pthread_once);
__weak_reference(_pthread_self_stub, _pthread_self);
__weak_reference(_pthread_rwlock_init_stub, _pthread_rwlock_init);
+__weak_reference(_pthread_rwlock_destroy_stub, _pthread_rwlock_destroy);
__weak_reference(_pthread_rwlock_rdlock_stub, _pthread_rwlock_rdlock);
__weak_reference(_pthread_rwlock_tryrdlock_stub, _pthread_rwlock_tryrdlock);
-__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrloc);
+__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrlock);
__weak_reference(_pthread_rwlock_unlock_stub, _pthread_rwlock_unlock);
__weak_reference(_pthread_rwlock_wrlock_stub, _pthread_rwlock_wrlock);
__weak_reference(_pthread_setspecific_stub, _pthread_setspecific);
__weak_reference(_pthread_sigmask_stub, _pthread_sigmask);
+__weak_reference(pthread_cond_init_stub, pthread_cond_init);
+__weak_reference(pthread_cond_signal_stub, pthread_cond_signal);
+__weak_reference(pthread_cond_broadcast_stub, pthread_cond_broadcast);
+__weak_reference(pthread_cond_wait_stub, pthread_cond_wait);
+__weak_reference(pthread_cond_destroy_stub, pthread_cond_destroy);
+__weak_reference(pthread_getspecific_stub, pthread_getspecific);
+__weak_reference(pthread_key_create_stub, pthread_key_create);
+__weak_reference(pthread_key_delete_stub, pthread_key_delete);
+__weak_reference(pthread_main_np_stub, pthread_main_np);
+__weak_reference(pthread_mutex_destroy_stub, pthread_mutex_destroy);
+__weak_reference(pthread_mutex_init_stub, pthread_mutex_init);
+__weak_reference(pthread_mutex_lock_stub, pthread_mutex_lock);
+__weak_reference(pthread_mutex_trylock_stub, pthread_mutex_trylock);
+__weak_reference(pthread_mutex_unlock_stub, pthread_mutex_unlock);
+__weak_reference(pthread_mutexattr_init_stub, pthread_mutexattr_init);
+__weak_reference(pthread_mutexattr_destroy_stub, pthread_mutexattr_destroy);
+__weak_reference(pthread_mutexattr_settype_stub, pthread_mutexattr_settype);
+__weak_reference(pthread_once_stub, pthread_once);
+__weak_reference(pthread_self_stub, pthread_self);
+__weak_reference(pthread_rwlock_init_stub, pthread_rwlock_init);
+__weak_reference(pthread_rwlock_destroy_stub, pthread_rwlock_destroy);
+__weak_reference(pthread_rwlock_rdlock_stub, pthread_rwlock_rdlock);
+__weak_reference(pthread_rwlock_tryrdlock_stub, pthread_rwlock_tryrdlock);
+__weak_reference(pthread_rwlock_trywrlock_stub, pthread_rwlock_trywrlock);
+__weak_reference(pthread_rwlock_unlock_stub, pthread_rwlock_unlock);
+__weak_reference(pthread_rwlock_wrlock_stub, pthread_rwlock_wrlock);
+__weak_reference(pthread_setspecific_stub, pthread_setspecific);
+__weak_reference(pthread_sigmask_stub, pthread_sigmask);
+
/* Define a null pthread structure just to satisfy _pthread_self. */
struct pthread {
};
static struct pthread main_thread;
-int
+static int
_pthread_cond_init_stub(pthread_cond_t *cond,
const pthread_condattr_t *cond_attr)
{
return (0);
}
-int
+static int
_pthread_cond_signal_stub(pthread_cond_t *cond)
{
return (0);
}
-int
+static int
+_pthread_cond_broadcast_stub(pthread_cond_t *cond)
+{
+ return (0);
+}
+
+static int
_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex)
{
return (0);
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list