PERFORCE change 152739 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Mon Nov 10 02:12:33 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=152739
Change 152739 by trasz at trasz_victim7 on 2008/11/10 10:12:24
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/ia64/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/mips/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/powerpc/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sparc64/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/rename.2#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_arm.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_minidump_arm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_private.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/libproc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/proc_create.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/stand.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/realhostname.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/bsdlabel.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snp.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/pseudofs.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmc_mdep.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/dump_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/minidump_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/minidump.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.arm#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/en/midway.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_amd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_amd.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_intel.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_pentium.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_piv.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_piv.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ppro.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_tsc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_tsc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_x86.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snp/snp.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/sysmouse.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uark2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubsa2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubser2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ucycom2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ugensa2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uipaq2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umct2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umodem2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umoscom2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvisor2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsserver/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_iso88025subr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_spppsubr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tty.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tty.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_fha.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cfictl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysent.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydefaults.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/xdr/xdr_mbuf.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/misc.sh#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/du/du.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/du/du.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/zfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/compile.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.1#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/cmdline.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/config_freebsd.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/test_strip_components.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/util.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/cron/cron.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/crontab/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/crontab/crontab.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/lib/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/lib/entry.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/lib/misc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/gssd.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmccontrol/pmccontrol.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmccontrol/pmccontrol.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/dist.c#3 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,8 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.5 2008/11/05 19:35:09 rodrigc Exp $
OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
IGNORE_PRAGMA= YES
+
+CFLAGS+= -DNEED_SOLARIS_BOOLEAN
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 (text+ko) ====
@@ -1576,7 +1576,7 @@
if ((v = make_argv(optarg)) == NULL)
fatal("failed to allocate memory");
- P = dtrace_proc_create(g_dtp, v[0], v);
+ P = dtrace_proc_create(g_dtp, v[0], v, NULL, NULL);
if (P == NULL)
dfatal(NULL); /* dtrace_errmsg() only */
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 (text+ko) ====
@@ -23,7 +23,7 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
+# ident "%Z%%M% %I% %E% SMI"
# Exception list: names tests that are bypassed when running in Java
# mode (relative to /opt/SUNWdtrt/tst)
@@ -49,6 +49,7 @@
common/usdt/tst.dlclose3.ksh
common/usdt/tst.eliminate.ksh
common/usdt/tst.enabled.ksh
+common/usdt/tst.enabled2.ksh
common/usdt/tst.entryreturn.ksh
common/usdt/tst.fork.ksh
common/usdt/tst.header.ksh
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 (text+ko) ====
@@ -868,15 +868,19 @@
/*
* We may have already processed this object file in an earlier linker
* invocation. Check to see if the present instruction sequence matches
- * the one we would install.
+ * the one we would install below.
*/
if (isenabled) {
- if (ip[0] == DT_OP_CLR_O0)
+ if (ip[0] == DT_OP_NOP) {
+ (*off) += sizeof (ip[0]);
return (0);
+ }
} else {
if (DT_IS_RESTORE(ip[1])) {
- if (ip[0] == DT_OP_RET)
+ if (ip[0] == DT_OP_RET) {
+ (*off) += sizeof (ip[0]);
return (0);
+ }
} else if (DT_IS_MOV_O7(ip[1])) {
if (DT_IS_RETL(ip[0]))
return (0);
@@ -910,7 +914,17 @@
return (-1);
}
- ip[0] = DT_OP_CLR_O0;
+
+ /*
+ * On SPARC, we take advantage of the fact that the first
+ * argument shares the same register as for the return value.
+ * The macro handles the work of zeroing that register so we
+ * don't need to do anything special here. We instrument the
+ * instruction in the delay slot as we'll need to modify the
+ * return register after that instruction has been emulated.
+ */
+ ip[0] = DT_OP_NOP;
+ (*off) += sizeof (ip[0]);
} else {
/*
* If the call is followed by a restore, it's a tail call so
@@ -919,11 +933,16 @@
* so change the call to a retl-like instruction that returns
* to that register value + 8 (rather than the typical %o7 +
* 8); the delay slot instruction is left, but should have no
- * effect. Otherwise we change the call to be a nop. In the
- * first and the last case we adjust the offset to land on what
- * was once the delay slot of the call so we correctly get all
- * the arguments as they would have been passed in a normal
- * function call.
+ * effect. Otherwise we change the call to be a nop. We
+ * identify the subsequent instruction as the probe point in
+ * all but the leaf tail-call case to ensure that arguments to
+ * the probe are complete and consistent. An astute, though
+ * largely hypothetical, observer would note that there is the
+ * possibility of a false-positive probe firing if the function
+ * contained a branch to the instruction in the delay slot of
+ * the call. Fixing this would require significant in-kernel
+ * modifications, and isn't worth doing until we see it in the
+ * wild.
*/
if (DT_IS_RESTORE(ip[1])) {
ip[0] = DT_OP_RET;
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 (text+ko) ====
@@ -115,8 +115,9 @@
#define DT_VERS_1_5 DT_VERSION_NUMBER(1, 5, 0)
#define DT_VERS_1_6 DT_VERSION_NUMBER(1, 6, 0)
#define DT_VERS_1_6_1 DT_VERSION_NUMBER(1, 6, 1)
-#define DT_VERS_LATEST DT_VERS_1_6_1
-#define DT_VERS_STRING "Sun D 1.6.1"
+#define DT_VERS_1_6_2 DT_VERSION_NUMBER(1, 6, 2)
+#define DT_VERS_LATEST DT_VERS_1_6_2
+#define DT_VERS_STRING "Sun D 1.6.2"
const dt_version_t _dtrace_versions[] = {
DT_VERS_1_0, /* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -130,6 +131,7 @@
DT_VERS_1_5, /* D API 1.5 Solaris Express 7/07 */
DT_VERS_1_6, /* D API 1.6 */
DT_VERS_1_6_1, /* D API 1.6.1 */
+ DT_VERS_1_6_2, /* D API 1.6.2 */
0
};
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 (text+ko) ====
@@ -955,7 +955,8 @@
}
struct ps_prochandle *
-dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv)
+dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
+ proc_child_func *pcf, void *child_arg)
{
dt_proc_hash_t *dph = dtp->dt_procs;
dt_proc_t *dpr;
@@ -981,7 +982,7 @@
#else
(void) proc_clearflags(dpr->dpr_proc, PR_RLC);
(void) proc_setflags(dpr->dpr_proc, PR_KLC);
- if ((err = proc_create(file, argv, &dpr->dpr_proc)) != 0)
+ if ((err = proc_create(file, argv, pcf, child_arg, &dpr->dpr_proc)) != 0)
return (dt_proc_error(dtp, dpr,
"failed to execute %s: %s\n", file, strerror(err)));
dpr->dpr_hdl = dtp;
@@ -1183,10 +1184,11 @@
}
struct ps_prochandle *
-dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv)
+dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
+ proc_child_func *pcf, void *child_arg)
{
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
- struct ps_prochandle *P = dt_proc_create(dtp, file, argv);
+ struct ps_prochandle *P = dt_proc_create(dtp, file, argv, pcf, child_arg);
if (P != NULL && idp != NULL && idp->di_id == 0)
#if defined(sun)
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 (text+ko) ====
@@ -99,7 +99,7 @@
} dt_proc_hash_t;
extern struct ps_prochandle *dt_proc_create(dtrace_hdl_t *,
- const char *, char *const *);
+ const char *, char *const *, proc_child_func *, void *);
extern struct ps_prochandle *dt_proc_grab(dtrace_hdl_t *, pid_t, int, int);
extern void dt_proc_release(dtrace_hdl_t *, struct ps_prochandle *);
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -436,8 +436,13 @@
if (fprintf(infop->dthi_out, ");\n") < 0)
return (dt_set_errno(dtp, errno));
- if (fprintf(infop->dthi_out, "extern int "
- "__dtraceenabled_%s___%s(void);\n", infop->dthi_pfname, fname) < 0)
+ if (fprintf(infop->dthi_out,
+ "#ifndef\t__sparc\n"
+ "extern int __dtraceenabled_%s___%s(void);\n"
+ "#else\n"
+ "extern int __dtraceenabled_%s___%s(long);\n"
+ "#endif\n",
+ infop->dthi_pfname, fname, infop->dthi_pfname, fname) < 0)
return (dt_set_errno(dtp, errno));
return (0);
@@ -499,13 +504,20 @@
return (dt_set_errno(dtp, errno));
if (!infop->dthi_empty) {
- if (fprintf(infop->dthi_out, "#define\t%s_%s_ENABLED() \\\n",
- infop->dthi_pmname, mname) < 0)
+ if (fprintf(infop->dthi_out,
+ "#ifndef\t__sparc\n"
+ "#define\t%s_%s_ENABLED() \\\n"
+ "\t__dtraceenabled_%s___%s()\n"
+ "#else\n"
+ "#define\t%s_%s_ENABLED() \\\n"
+ "\t__dtraceenabled_%s___%s(0)\n"
+ "#endif\n",
+ infop->dthi_pmname, mname,
+ infop->dthi_pfname, fname,
+ infop->dthi_pmname, mname,
+ infop->dthi_pfname, fname) < 0)
return (dt_set_errno(dtp, errno));
- if (fprintf(infop->dthi_out, "\t__dtraceenabled_%s___%s()\n",
- infop->dthi_pfname, fname) < 0)
- return (dt_set_errno(dtp, errno));
} else {
if (fprintf(infop->dthi_out, "#define\t%s_%s_ENABLED() (0)\n",
infop->dthi_pmname, mname) < 0)
==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 (text+ko) ====
@@ -33,6 +33,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <gelf.h>
+#include <libproc.h>
#ifdef __cplusplus
extern "C" {
@@ -413,7 +414,7 @@
*/
extern struct ps_prochandle *dtrace_proc_create(dtrace_hdl_t *,
- const char *, char *const *);
+ const char *, char *const *, proc_child_func *, void *);
extern struct ps_prochandle *dtrace_proc_grab(dtrace_hdl_t *, pid_t, int);
extern void dtrace_proc_release(dtrace_hdl_t *, struct ps_prochandle *);
==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#7 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.345 2008/09/16 20:18:25 thompsa Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.346 2008/11/05 10:20:33 keramida Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -265,6 +265,9 @@
kpasswdd_server_enable="NO" # Run kpasswdd (or NO)
kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon
+gssd_enable="NO" # Run the gssd daemon (or NO).
+gssd_flags="" # Flags for gssd.
+
rwhod_enable="NO" # Run the rwho daemon (or NO).
rwhod_flags="" # Flags for rwhod
rarpd_enable="NO" # Run rarpd (or NO).
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.30 2007/07/04 23:23:00 peter Exp $
+# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.31 2008/11/09 10:45:13 ed Exp $
SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c amd64_set_gsbase.c
@@ -7,8 +7,7 @@
reboot.S sbrk.S setlogin.S sigreturn.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
PSEUDO= _getlogin.o _exit.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/sys/Makefile.inc#2 (text+ko) ====
@@ -1,10 +1,9 @@
-# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.3 2007/07/04 23:23:00 peter Exp $
+# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.4 2008/11/09 10:45:13 ed Exp $
MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
PSEUDO= _exit.o _getlogin.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.32 2007/07/04 23:23:00 peter Exp $
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.33 2008/11/09 10:45:13 ed Exp $
.if !defined(COMPAT_32BIT)
SRCS+= i386_clr_watch.c i386_get_ioperm.c \
@@ -12,8 +12,7 @@
reboot.S sbrk.S setlogin.S sigreturn.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
PSEUDO= _getlogin.o _exit.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/ia64/sys/Makefile.inc#2 (text+ko) ====
@@ -1,11 +1,10 @@
-# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.9 2007/07/04 23:23:00 peter Exp $
+# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.10 2008/11/09 10:45:13 ed Exp $
MDASM+= Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
sbrk.S setlogin.S sigreturn.S swapcontext.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
PSEUDO= _getlogin.o _exit.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/mips/sys/Makefile.inc#2 (text+ko) ====
@@ -1,12 +1,11 @@
-# $FreeBSD: src/lib/libc/mips/sys/Makefile.inc,v 1.3 2008/04/26 12:08:02 imp Exp $
+# $FreeBSD: src/lib/libc/mips/sys/Makefile.inc,v 1.4 2008/11/09 10:45:13 ed Exp $
MDASM= Ovfork.S brk.S cerror.S exect.S \
fork.S pipe.S ptrace.S sbrk.S shmat.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \
- lseek.o mmap.o openbsd_poll.o pread.o \
- pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o
+NOASM= break.o exit.o ftruncate.o getlogin.o lseek.o mmap.o \
+ openbsd_poll.o pread.o pwrite.o sstk.o truncate.o vfork.o yield.o
PSEUDO= _exit.o _getlogin.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/powerpc/sys/Makefile.inc#2 (text+ko) ====
@@ -1,10 +1,9 @@
-# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.3 2007/07/04 23:23:00 peter Exp $
+# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.4 2008/11/09 10:45:13 ed Exp $
MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
PSEUDO= _getlogin.o _exit.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sparc64/sys/Makefile.inc#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.11 2007/07/04 23:23:01 peter Exp $
+# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.12 2008/11/09 10:45:13 ed Exp $
SRCS+= __sparc_sigtramp_setup.c \
__sparc_utrap.c \
@@ -18,8 +18,7 @@
MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getdomainname.o getlogin.o openbsd_poll.o \
- setdomainname.o sstk.o uname.o yield.o
+NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
PSEUDO= _getlogin.o _exit.o
.if !defined(WITHOUT_SYSCALL_COMPAT)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/rename.2#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rename.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.28 2008/04/16 13:03:12 kib Exp $
+.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.29 2008/11/07 15:01:40 trasz Exp $
.\"
.Dd April 10, 2008
.Dt RENAME 2
@@ -156,6 +156,11 @@
.It Bq Er EACCES
The requested link requires writing in a directory with a mode
that denies write permission.
+.It Bq Er EACCES
+The directory pointed at by the
+.Fa from
+argument denies write permission, and the operation would move
+it to another parent directory.
.It Bq Er EPERM
The file pointed at by the
.Fa from
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libkvm/Makefile,v 1.19 2008/08/19 21:30:36 jhb Exp $
+# $FreeBSD: src/lib/libkvm/Makefile,v 1.20 2008/11/06 16:20:27 raj Exp $
LIB= kvm
SHLIBDIR?= /lib
@@ -11,7 +11,7 @@
SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \
kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "arm"
SRCS+= kvm_minidump_${MACHINE_ARCH}.c
.endif
INCS= kvm.h
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_arm.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.4 2007/01/08 18:25:58 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.5 2008/11/06 16:20:27 raj Exp $");
#include <sys/param.h>
#include <sys/elf32.h>
@@ -52,10 +52,13 @@
#include <limits.h>
#include <kvm.h>
#include <stdlib.h>
+#include <unistd.h>
#include "kvm_private.h"
+/* minidump must be the first item! */
struct vmstate {
+ int minidump; /* 1 = minidump mode */
pd_entry_t *l1pt;
void *mmapbase;
size_t mmapsize;
@@ -107,6 +110,8 @@
_kvm_freevtop(kvm_t *kd)
{
if (kd->vmst != 0) {
+ if (kd->vmst->minidump)
+ return (_kvm_minidump_freevtop(kd));
if (kd->vmst->mmapbase != NULL)
munmap(kd->vmst->mmapbase, kd->vmst->mmapsize);
free(kd->vmst);
@@ -117,13 +122,25 @@
int
_kvm_initvtop(kvm_t *kd)
{
- struct vmstate *vm = _kvm_malloc(kd, sizeof(*vm));
+ struct vmstate *vm;
struct nlist nlist[2];
u_long kernbase, physaddr, pa;
pd_entry_t *l1pt;
Elf32_Ehdr *ehdr;
size_t hdrsz;
-
+ char minihdr[8];
+
+ if (!kd->rawdump) {
+ if (pread(kd->pmfd, &minihdr, 8, 0) == 8) {
+ if (memcmp(&minihdr, "minidump", 8) == 0)
+ return (_kvm_minidump_initvtop(kd));
+ } else {
+ _kvm_err(kd, kd->program, "cannot read header");
+ return (-1);
+ }
+ }
+
+ vm = _kvm_malloc(kd, sizeof(*vm));
if (vm == 0) {
_kvm_err(kd, kd->program, "cannot allocate vm");
return (-1);
@@ -193,6 +210,9 @@
pt_entry_t pte;
u_long pte_pa;
+ if (kd->vmst->minidump)
+ return (_kvm_minidump_kvatop(kd, va, pa));
+
if (vm->l1pt == NULL)
return (_kvm_pa2off(kd, va, pa, PAGE_SIZE));
pd = vm->l1pt[L1_IDX(va)];
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_private.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kvm_private.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libkvm/kvm_private.h,v 1.12 2007/06/15 11:35:11 simokawa Exp $
+ * $FreeBSD: src/lib/libkvm/kvm_private.h,v 1.13 2008/11/06 16:20:27 raj Exp $
*/
struct __kvm {
@@ -79,7 +79,7 @@
__printflike(3, 4);
int _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__amd64__) || defined(__i386__) || defined(__arm__)
void _kvm_minidump_freevtop(kvm_t *);
int _kvm_minidump_initvtop(kvm_t *);
int _kvm_minidump_kvatop(kvm_t *, u_long, off_t *);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/libproc.h#2 (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/libproc/libproc.h,v 1.1 2008/05/22 02:09:21 jb Exp $
+ * $FreeBSD: src/lib/libproc/libproc.h,v 1.2 2008/11/05 19:35:43 rodrigc Exp $
*/
#ifndef _LIBPROC_H_
@@ -33,6 +33,8 @@
struct proc_handle;
+typedef void (*proc_child_func)(void *);
+
/* Values returned by proc_state(). */
#define PS_IDLE 1
#define PS_STOP 2
@@ -55,7 +57,8 @@
int proc_attach(pid_t pid, int flags, struct proc_handle **pphdl);
int proc_continue(struct proc_handle *);
int proc_clearflags(struct proc_handle *, int);
-int proc_create(const char *, char * const *, struct proc_handle **);
+int proc_create(const char *, char * const *, proc_child_func *, void *,
+ struct proc_handle **);
int proc_detach(struct proc_handle *);
int proc_getflags(struct proc_handle *);
int proc_name2sym(struct proc_handle *, const char *, const char *, GElf_Sym *);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/proc_create.c#2 (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/libproc/proc_create.c,v 1.1 2008/05/22 02:09:21 jb Exp $
+ * $FreeBSD: src/lib/libproc/proc_create.c,v 1.2 2008/11/05 19:35:43 rodrigc Exp $
*/
#include "_libproc.h"
@@ -90,7 +90,8 @@
}
int
-proc_create(const char *file, char * const *argv, struct proc_handle **pphdl)
+proc_create(const char *file, char * const *argv, proc_child_func *pcf,
+ void *child_arg, struct proc_handle **pphdl)
{
struct proc_handle *phdl;
struct kevent kev;
@@ -106,13 +107,16 @@
return (ENOMEM);
/* Fork a new process. */
- if ((pid = fork()) == -1)
+ if ((pid = vfork()) == -1)
error = errno;
else if (pid == 0) {
/* The child expects to be traced. */
if (ptrace(PT_TRACE_ME, 0, 0, 0) != 0)
_exit(1);
+ if (pcf != NULL)
+ (*pcf)(child_arg);
+
/* Execute the specified file: */
execvp(file, argv);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/stand.h#3 (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/libstand/stand.h,v 1.43 2008/09/04 10:05:44 raj Exp $
+ * $FreeBSD: src/lib/libstand/stand.h,v 1.44 2008/11/06 16:30:32 raj Exp $
* From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $
*/
@@ -236,10 +236,6 @@
extern void *reallocf(void *ptr, size_t size);
extern void mallocstats(void);
-/* disklabel support (undocumented, may be junk) */
-struct disklabel;
-extern char *getdisklabel(const char *, struct disklabel *);
-
extern int printf(const char *fmt, ...) __printflike(1, 2);
extern void vprintf(const char *fmt, __va_list);
extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libutil/Makefile,v 1.69 2008/11/04 13:51:15 des Exp $
+# $FreeBSD: src/lib/libutil/Makefile,v 1.71 2008/11/05 11:06:10 des Exp $
SHLIBDIR?= /lib
@@ -8,14 +8,14 @@
LIB= util
SHLIB_MAJOR= 7
-SRCS= _secure_path.c auth.c gr_util.c expand_number.c flopen.c fparseln.c \
+SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
hexdump.c humanize_number.c kld.c login.c login_auth.c login_cap.c \
login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
logout.c logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
stub.c trimdomain.c uucplock.c
INCS= libutil.h login_cap.h
-WARNS?= 6
+#WARNS?= 6
CFLAGS+= -DLIBC_SCCS
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/realhostname.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.19 2008/10/17 21:21:14 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.20 2008/11/05 12:13:10 des Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -83,6 +83,18 @@
return result;
}
+/*
+ * struct sockaddr has very lax alignment requirements, since all its
+ * members are char or equivalent. This is a problem when trying to
+ * dereference a struct sockaddr_in6 * that was passed in as a struct
+ * sockaddr *. Although we know (or trust) that the passed-in struct was
+ * properly aligned, the compiler doesn't, and (rightly) complains. These
+ * macros perform the cast in a way that the compiler will accept.
+ */
+#define SOCKADDR_IN6(p) ((struct sockaddr_in6 *)(void *)(p))
+#define SOCKADDR_IN(p) ((struct sockaddr_in *)(void *)(p))
+#define SOCKINET(p) ((struct sockinet *)(void *)(p))
+
int
realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen)
{
@@ -96,10 +108,10 @@
/* IPv4 mapped IPv6 addr consideraton, specified in rfc2373. */
if (addr->sa_family == AF_INET6 &&
addrlen == sizeof(struct sockaddr_in6) &&
- IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr)) {
+ IN6_IS_ADDR_V4MAPPED(&SOCKADDR_IN6(addr)->sin6_addr)) {
struct sockaddr_in6 *sin6;
- sin6 = (struct sockaddr_in6 *)addr;
+ sin6 = SOCKADDR_IN6(addr);
memset(&lsin, 0, sizeof(lsin));
lsin.sin_len = sizeof(struct sockaddr_in);
@@ -142,15 +154,16 @@
}
if (sa->sa_len == addrlen &&
sa->sa_family == addr->sa_family) {
- ((struct sockinet *)sa)->si_port = ((struct sockinet *)addr)->si_port;
+ SOCKINET(sa)->si_port = SOCKINET(addr)->si_port;
#ifdef INET6
/*
* XXX: sin6_socpe_id may not been
* filled by DNS
*/
if (sa->sa_family == AF_INET6 &&
- ((struct sockaddr_in6 *)sa)->sin6_scope_id == 0)
- ((struct sockaddr_in6 *)sa)->sin6_scope_id = ((struct sockaddr_in6 *)addr)->sin6_scope_id;
+ SOCKADDR_IN6(sa)->sin6_scope_id == 0)
+ SOCKADDR_IN6(sa)->sin6_scope_id =
+ SOCKADDR_IN6(addr)->sin6_scope_id;
#endif
if (!memcmp(sa, addr, sa->sa_len)) {
result = HOSTNAME_FOUND;
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/bsdlabel.8#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.70 2007/12/08 23:41:13 remko Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.72 2008/11/05 09:28:30 maxim Exp $
.\"
.Dd December 8, 2007
.Dt BSDLABEL 8
@@ -481,7 +481,7 @@
labels are restricted to a maximum of 2^32-1 sectors.
This usually means 2TB of disk space.
Larger disks should be partitioned using another method such as
-.Xr gpt 8 .
+.Xr gpart 8 .
.Pp
The various
.Bx Ns s
@@ -497,5 +497,5 @@
.Xr disktab 5 ,
.Xr boot0cfg 8 ,
.Xr fdisk 8 ,
-.Xr gpt 8 ,
+.Xr gpart 8 ,
.Xr newfs 8
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#5 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $
+.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.27 2008/11/08 17:45:47 keramida Exp $
.\"
-.Dd October 24, 2008
+.Dd November 8, 2008
.Dt SND_HDA 4
.Os
.Sh NAME
@@ -57,8 +57,8 @@
driver that allows the generic audio driver,
.Xr sound 4 ,
to be used with this hardware.
-.Nm
-only supports audio functions.
+Only audio functions are supported by
+.Nm .
Modem, HDMI and other possible functions are not implemented.
.Pp
The
@@ -68,7 +68,7 @@
Universal Audio Architecture (UAA) draft (revision 0.7b) for handling audio
devices.
.Pp
-According to HDA and UAA specifications, depending on number of HDA buses
+According to HDA and UAA specifications, depending on the number of HDA buses
and codecs present in system, their audio capabilities and BIOS provided
configuration, the
.Nm
@@ -76,14 +76,16 @@
For example, one device for main rear 7.1 output and inputs, one device
for independent headset connectors at front and one device for SPDIF or
HDMI audio input/output.
-Usually that assignment may be widely tuned by using device hints.
-A lot of useful information about driver operation and present audio setup may
-be obtained from the driver verbose boot messages.
+The assignment of audio inputs and outputs may be tuned with
+.Xr device.hints 5 .
+The driver's verbose boot messages provide a lot of information about
+the operation of the driver and present audio setup.
.Pp
-You can select audio device to use by default with hw.snd.default_unit
-sysctl described in
-.Xr sound 4
-or explicitly specify it in appliation settings.
+The default audio device may be tuned by setting the
+.Ar hw.snd.default_unit
+sysctl, as described in
+.Xr sound 4 ,
+or explicitly specified in application settings.
.Ss Boot-time Configuration
The following variables are available at boot-time through the
.Xr device.hints 5
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list