PERFORCE change 21064 for review
Robert Watson
rwatson at freebsd.org
Fri Nov 15 06:54:52 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=21064
Change 21064 by rwatson at rwatson_tislabs on 2002/11/14 22:54:22
Integ TrustedBSD MAC branch from the TrustedBSD base branch:
bind update, various cleanups, Sam's ifnet changes, also
loopback of some MAC stuff including condition variable
changes.
Affected files ...
.. //depot/projects/trustedbsd/mac/Makefile.inc1#29 integrate
.. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate
.. //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/_setjmp.S#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_attr_init.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_autoinit.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_cond.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_create.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_execve.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_exit.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_gc.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_init.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_join.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mutex.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_once.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_pselect.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_rwlock.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sem.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sig.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_stack.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#18 integrate
.. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#10 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#3 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#12 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#45 integrate
.. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#6 integrate
.. //depot/projects/trustedbsd/mac/release/ia64/boot_crunch.conf#2 integrate
.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#11 integrate
.. //depot/projects/trustedbsd/mac/sbin/devd/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/devd/devd.8#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#14 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/mk/bsd.sys.mk#7 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC.hints#3 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#5 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#13 integrate
.. //depot/projects/trustedbsd/mac/sys/cam/cam_periph.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_low.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options#40 integrate
.. //depot/projects/trustedbsd/mac/sys/contrib/dev/oltr/if_oltr.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aic/aic_pccard.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pccard.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pci.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/awi/if_awi_pccard.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus_cis.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cm/smc90cx6.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_pccard.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_pccard.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxvar.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lgereg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_cbus.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_isa.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_pci.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mly/mly.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard_cis.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccardvar.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pci/pci_pci.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pdq/pdq_ifsubr.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/snc/dp83932.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/txp/if_txp.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_auereg.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cuereg.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kuereg.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/wl/if_wl.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe_pccard.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/i686_mem.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_clock.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_cx.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_el.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_le.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#360 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/agp/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/hifn/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/ubsec/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bpf.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bpf.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bridge.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bridge.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/net/ethernet.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/net/fddi.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_disc.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ef.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_faith.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_loop.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_stf.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_var.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan_var.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_ali.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_amd.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_intel.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_sis.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp_via.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/pci/psycho.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/msgbuf.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/socket.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/stddef.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_object.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#13 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#11 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xargs/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#12 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/xinstall/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_elf32.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/mtree/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.8#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.c#8 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#8 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#8 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#6 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#9 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/install.c#13 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#10 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/Makefile.inc1#29 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $
#
# Make command line options:
# -DMAKE_KERBEROS4 to build KerberosIV
@@ -123,6 +123,7 @@
.endif
MAKEOBJDIRPREFIX?= /usr/obj
+OSRELDATE!= sysctl -n kern.osreldate
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
@@ -193,7 +194,8 @@
BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
+BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+ BOOTSTRAPPING=${OSRELDATE} \
-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
@@ -201,8 +203,8 @@
TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
- -DNO_CPU_CFLAGS
+TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \
+ BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS
# cross-tool stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
@@ -727,7 +729,8 @@
.endif
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \
- lib/libncurses lib/libopie lib/libradius lib/librpcsvc \
+ lib/libncurses lib/libopie lib/libpam lib/libradius \
+ lib/librpcsvc \
lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
lib/libz lib/msun
@@ -753,7 +756,7 @@
_generic_libs+= usr.sbin/pcvt/keycap
.endif
-.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs}
+.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
${ECHODIR} "===> ${_lib}"; \
@@ -764,6 +767,16 @@
.endif
.endfor
+# libpam is special: we need to build static PAM modules before
+# static PAM library, and dynamic PAM library before dynamic PAM
+# modules.
+lib/libpam__L: .PHONY
+ ${ECHODIR} "===> lib/libpam"; \
+ cd ${.CURDIR}/lib/libpam; \
+ ${MAKE} DIRPRFX=lib/libpam/ depend; \
+ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
+ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+
_startup_libs: ${_startup_libs:S/$/__L/}
_prebuild_libs: ${_prebuild_libs:S/$/__L/}
_generic_libs: ${_generic_libs:S/$/__L/}
==== //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#4 (text+ko) ====
@@ -43,14 +43,14 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $");
#include <ctype.h>
#include <limits.h>
-#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
+#include <string.h>
void usage(void);
@@ -59,25 +59,15 @@
{
struct timespec time_to_sleep;
long l;
- int ch, neg;
+ int neg;
char *p;
- while ((ch = getopt(argc, argv, "")) != -1)
- switch(ch) {
- case '?':
- default:
- usage();
- /* NOTREACHED */
- }
- argc -= optind;
- argv += optind;
-
- if (argc != 1) {
+ if (argc != 2) {
usage();
/* NOTREACHED */
}
- p = argv[0];
+ p = argv[1];
/* Skip over leading whitespaces. */
while (isspace((unsigned char)*p))
@@ -88,6 +78,9 @@
if (*p == '-') {
neg = 1;
++p;
+ if (!isdigit((unsigned char)*p) && *p != '.')
+ usage();
+ /* NOTREACHED */
}
else if (*p == '+')
++p;
@@ -128,7 +121,8 @@
void
usage(void)
{
+ const char *msg = "usage: sleep seconds\n";
- (void)fprintf(stderr, "usage: sleep seconds\n");
+ write(STDERR_FILENO, msg, strlen(msg));
exit(1);
}
==== //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#5 (text+ko) ====
@@ -1,3 +1,23 @@
+1469. [bug] buffer length calculation for PX was wrong.
+
+1468. [bug] ns_name_ntol() could overwite a zero length buffer.
+
+1467. [bug] off by one bug in ns_makecannon().
+
+1466. [bug] large ENDS UDP buffer size could trigger a assertion.
+
+1465. [bug] possible NULL pointer dereference in db_sec.c
+
+1464. [bug] the buffer used to construct the -ve record was not
+ big enough for all possible SOA records. use pointer
+ arithmetic to calculate the remaining size in this
+ buffer.
+
+1463. [bug] use serial space arithmetic to determine if a SIG is
+ too old, in the future or has internally constistant
+ times.
+
+1462. [bug] write buffer overflow in make_rr().
--- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002)
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#4 (text+ko) ====
@@ -78,7 +78,7 @@
*/
/* max length of data in RR data field */
-#define MAXDATA (2*MAXDNAME + 5*INT32SZ)
+#define MAXDATA (3*MAXDNAME + 5*INT32SZ)
/* max length of data in a TXT RR segment */
#define MAXCHARSTRING 255
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#3 (text+ko) ====
@@ -479,7 +479,9 @@
struct sig_record *sigdata;
struct dnode *sigdn;
struct databuf *sigdp;
- time_t now;
+ u_int32_t now;
+ u_int32_t exptime;
+ u_int32_t signtime;
char *signer;
u_char name_n[MAXDNAME];
u_char *sig, *eom;
@@ -492,6 +494,7 @@
int dnssec_failed = 0, dnssec_succeeded = 0;
int return_value;
int i;
+ int expired = 0;
if (rrset == NULL || rrset->rr_name == NULL) {
ns_warning (ns_log_default, "verify_set: missing rrset/name");
@@ -527,11 +530,14 @@
* Don't verify a set if the SIG inception time is in
* the future. This should be fixed before 2038 (BEW)
*/
- if ((time_t)ntohl(sigdata->sig_time_n) > now)
+ signtime = ntohl(sigdata->sig_time_n);
+ if (SEQ_GT(signtime, now))
continue;
/* An expired set is dropped, but the data is not. */
- if ((time_t)ntohl(sigdata->sig_exp_n) < now) {
+ exptime = ntohl(sigdata->sig_exp_n);
+ if (SEQ_GT(now, exptime)) {
+ expired++;
db_detach(&sigdn->dp);
sigdp = NULL;
continue;
@@ -723,7 +729,7 @@
}
end:
- if (dnssec_failed > 0)
+ if (dnssec_failed > 0 || expired > 0)
rrset_trim_sigs(rrset);
if (trustedkey == 0 && key != NULL)
dst_free_key(key);
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#5 (text+ko) ====
@@ -469,7 +469,7 @@
q_cmsglen, /* len of cname message */
q_cmsgsize; /* allocated size of cname message */
int16_t q_dfd; /* UDP file descriptor */
- int16_t q_udpsize; /* UDP message size */
+ u_int16_t q_udpsize; /* UDP message size */
int q_distance; /* distance this query is from the
* original query that the server
* received. */
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#3 (text+ko) ====
@@ -66,7 +66,7 @@
u_int16_t atype;
u_char *sp, *cp1;
u_char data[MAXDATA];
- size_t len = sizeof data;
+ u_char *eod = data + sizeof(data);
#endif
nameserIncr(from.sin_addr, nssRcvdNXD);
@@ -186,7 +186,7 @@
rdatap = cp;
/* origin */
- n = dn_expand(msg, msg + msglen, cp, (char*)data, len);
+ n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data);
if (n < 0) {
ns_debug(ns_log_ncache, 3,
"ncache: origin form error");
@@ -195,9 +195,8 @@
cp += n;
n = strlen((char*)data) + 1;
cp1 = data + n;
- len -= n;
/* mail */
- n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len);
+ n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1);
if (n < 0) {
ns_debug(ns_log_ncache, 3, "ncache: mail form error");
return;
@@ -205,20 +204,20 @@
cp += n;
n = strlen((char*)cp1) + 1;
cp1 += n;
- len -= n;
n = 5 * INT32SZ;
+ if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */
+ return;
BOUNDS_CHECK(cp, n);
memcpy(cp1, cp, n);
/* serial, refresh, retry, expire, min */
cp1 += n;
- len -= n;
cp += n;
if (cp != rdatap + dlen) {
ns_debug(ns_log_ncache, 3, "ncache: form error");
return;
}
/* store the zone of the soa record */
- n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len);
+ n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1);
if (n < 0) {
ns_debug(ns_log_ncache, 3, "ncache: form error 2");
return;
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#5 (text+ko) ====
@@ -2195,7 +2195,7 @@
/* first just copy over the type_covered, algorithm, */
/* labels, orig ttl, two timestamps, and the footprint */
- if ((dp->d_size - 18) > buflen)
+ if (buflen < 18)
goto cleanup; /* out of room! */
memcpy(cp, cp1, 18);
cp += 18;
==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#5 (text+ko) ====
@@ -2001,7 +2001,7 @@
* to BOUNDS_CHECK() here.
*/
cp1 += (n = strlen((char *)cp1) + 1);
- n1 = sizeof(data) - n;
+ n1 = sizeof(data) - n - INT16SZ;
n = dn_expand(msg, eom, cp, (char *)cp1, n1);
if (n < 0) {
hp->rcode = FORMERR;
@@ -2043,8 +2043,18 @@
ttl = origTTL;
}
+ /*
+ * Check that expire and signature times are internally
+ * consistant.
+ */
+ if (!SEQ_GT(exptime, signtime) && exptime != signtime) {
+ ns_debug(ns_log_default, 3,
+ "ignoring SIG: signature expires before it was signed");
+ return ((cp - rrp) + dlen);
+ }
+
/* Don't let bogus signers "sign" in the future. */
- if (signtime > now) {
+ if (SEQ_GT(signtime, now)) {
ns_debug(ns_log_default, 3,
"ignoring SIG: signature date %s is in the future",
p_secstodate (signtime));
@@ -2052,7 +2062,7 @@
}
/* Ignore received SIG RR's that are already expired. */
- if (exptime <= now) {
+ if (SEQ_GT(now, exptime)) {
ns_debug(ns_log_default, 3,
"ignoring SIG: expiration %s is in the past",
p_secstodate (exptime));
==== //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#4 (text+ko) ====
@@ -341,6 +341,10 @@
dn = dst;
eom = dst + dstsiz;
+ if (dn >= eom) {
+ errno = EMSGSIZE;
+ return (-1);
+ }
while ((n = *cp++) != 0) {
if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
/* Some kind of compression pointer. */
==== //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ====
@@ -166,7 +166,7 @@
ns_makecanon(const char *src, char *dst, size_t dstsize) {
size_t n = strlen(src);
- if (n + sizeof "." > dstsize) {
+ if (n + sizeof "." + 1 > dstsize) {
errno = EMSGSIZE;
return (-1);
}
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $
.include "../Makefile.inc0"
@@ -10,7 +10,9 @@
hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \
objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \
xstrdup.c xstrerror.c
-.if defined(BOOTSTRAPPING)
+.if defined(BOOTSTRAPPING) && \
+ ( ${BOOTSTRAPPING} < 440000 || \
+ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 ))
SRCS+= basename.c
.endif
WARNS= 1
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/auto-host.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */
#include <sys/param.h>
@@ -357,7 +357,10 @@
/* #undef _GNU_SOURCE */
/* Define if you have a working <stdbool.h> header file. */
+#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
+ __FreeBSD_version >= 500014
#define HAVE_STDBOOL_H 1
+#endif
/* Define if you can safely include both <string.h> and <strings.h>. */
#define STRING_WITH_STRINGS 1
==== //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $
+# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $
LIB= asn1
CFLAGS+=-I${KRB5DIR}/include \
@@ -106,7 +106,9 @@
strupr.c
${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
-.if defined(BOOTSTRAPPING)
+.if defined(BOOTSTRAPPING) && \
+ ( ${BOOTSTRAPPING} < 440001 || \
+ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 ))
asn1_compile: getprogname.c setprogname.c
.endif
==== //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $
+# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $
LIB= hdb
CFLAGS+=-I${KRB5DIR}/include \
@@ -61,7 +61,9 @@
get_window_size.c strupr.c
${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
-.if defined(BOOTSTRAPPING)
+.if defined(BOOTSTRAPPING) && \
+ ( ${BOOTSTRAPPING} < 440001 || \
+ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 ))
asn1_compile: getprogname.c setprogname.c
.endif
==== //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#5 (text+ko) ====
@@ -25,14 +25,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.10 2002/11/13 21:55:22 deischen Exp $");
#include <signal.h>
#include <pthread.h>
-#include <pthread_np.h>
-void *_pthread_getspecific(pthread_key_t key);
-pthread_t _pthread_self(void);
+#include "libc_private.h"
/*
* Weak symbols: All libc internal usage of these functions should
@@ -42,69 +40,7 @@
* 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);
-__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);
-
-__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 {
@@ -112,342 +48,179 @@
static struct pthread main_thread;
-static int
-_pthread_cond_init_stub(pthread_cond_t *cond,
- const pthread_condattr_t *cond_attr)
-{
- return (0);
-}
+static int stub_main(void);
+static void *stub_null(void);
+static struct pthread *stub_self(void);
+static int stub_zero(void);
-static int
-_pthread_cond_signal_stub(pthread_cond_t *cond)
-{
- return (0);
-}
+#define PJT_DUAL_ENTRY(entry) \
+ (pthread_func_t)entry, (pthread_func_t)entry
-static int
-_pthread_cond_broadcast_stub(pthread_cond_t *cond)
-{
- return (0);
-}
+pthread_func_entry_t __thr_jtable[PJT_MAX] = {
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */
+ {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */
+ {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */
+ {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */
+ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */
+ {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */
+};
-static int
-_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
- return (0);
-}
+/*
+ * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines.
+ */
+#define WEAK_REF(sym, alias) __weak_reference(sym, alias)
-static int
-_pthread_cond_destroy_stub(pthread_cond_t *cond)
-{
- return (0);
-}
+#define FUNC_TYPE(name) __CONCAT(name, _func_t)
+#define FUNC_INT(name) __CONCAT(name, _int)
+#define FUNC_EXP(name) __CONCAT(name, _exp)
-static void *
-_pthread_getspecific_stub(pthread_key_t key)
-{
- return (NULL);
-}
+#define STUB_FUNC(name, idx, ret) \
+ static ret FUNC_EXP(name)(void) __unused; \
+ static ret FUNC_INT(name)(void) __unused; \
+ WEAK_REF(FUNC_EXP(name), name); \
+ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \
+ typedef ret (*FUNC_TYPE(name))(void); \
+ static ret FUNC_EXP(name)(void) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \
+ return (func()); \
+ } \
+ static ret FUNC_INT(name)(void) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \
+ return (func()); \
+ }
-static int
-_pthread_key_create_stub(pthread_key_t *key, void (*destructor) (void *))
-{
- return (0);
-}
+#define STUB_FUNC1(name, idx, ret, p0_type) \
+ static ret FUNC_EXP(name)(p0_type) __unused; \
+ static ret FUNC_INT(name)(p0_type) __unused; \
+ WEAK_REF(FUNC_EXP(name), name); \
+ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \
+ typedef ret (*FUNC_TYPE(name))(p0_type); \
+ static ret FUNC_EXP(name)(p0_type p0) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \
+ return (func(p0)); \
+ } \
+ static ret FUNC_INT(name)(p0_type p0) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \
+ return (func(p0)); \
+ }
-static int
-_pthread_key_delete_stub(pthread_key_t key)
-{
- return (0);
-}
+#define STUB_FUNC2(name, idx, ret, p0_type, p1_type) \
+ static ret FUNC_EXP(name)(p0_type, p1_type) __unused; \
+ static ret FUNC_INT(name)(p0_type, p1_type) __unused; \
+ WEAK_REF(FUNC_EXP(name), name); \
+ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \
+ typedef ret (*FUNC_TYPE(name))(p0_type, p1_type); \
+ static ret FUNC_EXP(name)(p0_type p0, p1_type p1) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \
+ return (func(p0, p1)); \
+ } \
+ static ret FUNC_INT(name)(p0_type p0, p1_type p1) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \
+ return (func(p0, p1)); \
+ }
-static int
-_pthread_main_np_stub()
-{
- return (-1);
-}
+#define STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type) \
+ static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __unused; \
+ static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __unused; \
+ WEAK_REF(FUNC_EXP(name), name); \
+ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \
+ typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \
+ static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \
+ return (func(p0, p1, p2)); \
+ } \
+ static ret FUNC_INT(name)(p0_type p0, p1_type p1, p2_type p2) \
+ { \
+ FUNC_TYPE(name) func; \
+ func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \
+ return (func(p0, p1, p2)); \
+ }
-static int
-_pthread_mutex_destroy_stub(pthread_mutex_t *mattr)
-{
- return (0);
-}
+STUB_FUNC1(pthread_cond_broadcast, PJT_COND_BROADCAST, int, void *)
+STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *)
+STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *)
+STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *)
+STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *)
+STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t)
+STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *)
+STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t)
+STUB_FUNC(pthread_main_np, PJT_MAIN_NP, int)
+STUB_FUNC1(pthread_mutex_destroy, PJT_MUTEX_DESTROY, int, void *)
+STUB_FUNC2(pthread_mutex_init, PJT_MUTEX_INIT, int, void *, void *)
+STUB_FUNC1(pthread_mutex_lock, PJT_MUTEX_LOCK, int, void *)
+STUB_FUNC1(pthread_mutex_trylock, PJT_MUTEX_TRYLOCK, int, void *)
+STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *)
+STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *)
+STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *)
+STUB_FUNC1(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *)
+STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *)
+STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *)
+STUB_FUNC2(pthread_rwlock_init, PJT_RWLOCK_INIT, int, void *, void *)
+STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *)
+STUB_FUNC1(pthread_rwlock_tryrdlock, PJT_RWLOCK_TRYRDLOCK, int, void *)
+STUB_FUNC1(pthread_rwlock_trywrlock, PJT_RWLOCK_TRYWRLOCK, int, void *)
>>> 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