PERFORCE change 152126 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Oct 28 21:22:58 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=152126
Change 152126 by trasz at trasz_victim7 on 2008/10/28 21:22:08
IFC, replacing vaccess_t with accmode_t.
Note: untested, might not even compile.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/TODO#50 edit
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/remote#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libcam/camlib.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_getcwd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_console.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vnops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vnops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_vnops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#33 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#17 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_sack.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_var.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vnops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/pc98_machdep.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/trap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/cpu.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/cuda.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/cudavar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdma.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdmavar.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macgpio.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macgpiovar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/pmu.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/pmuvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/viareg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_vfs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#9 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_system.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/_types.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cons.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/extattr.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/types.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#13 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#9 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/TODO#50 (text+ko) ====
@@ -4,10 +4,6 @@
- MFP4 of the above.
-- Use vaccess_t (mostly done).
-
-- MFP4 of the above.
-
- Decide how VAPPEND is supposed to work - always OR-ed with VWRITE,
or used alone. Fix stuff accordingly.
==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#10 (text+ko) ====
@@ -22,6 +22,9 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20081028:
+ dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
20081009:
The uhci, ohci, ehci and slhci USB Host controller drivers have
been put into separate modules. If you load the usb module
@@ -1146,4 +1149,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $
+$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $
==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -137,41 +137,39 @@
* Mmap and write if less than 8M (the limit is so we don't totally
* trash memory on big files. This is really a minor hack, but it
* wins some CPU back.
+ * Some filesystems, such as smbnetfs, don't support mmap,
+ * so this is a best-effort attempt.
*/
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
- fs->st_size <= 8 * 1048576) {
- if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
- MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
+ fs->st_size <= 8 * 1024 * 1024 &&
+ (p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+ MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) {
+ wtotal = 0;
+ for (bufp = p, wresid = fs->st_size; ;
+ bufp += wcount, wresid -= (size_t)wcount) {
+ wcount = write(to_fd, bufp, wresid);
+ if (wcount <= 0)
+ break;
+ wtotal += wcount;
+ if (info) {
+ info = 0;
+ (void)fprintf(stderr,
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
+ }
+ if (wcount >= (ssize_t)wresid)
+ break;
+ }
+ if (wcount != (ssize_t)wresid) {
+ warn("%s", to.p_path);
+ rval = 1;
+ }
+ /* Some systems don't unmap on close(2). */
+ if (munmap(p, fs->st_size) < 0) {
warn("%s", entp->fts_path);
rval = 1;
- } else {
- wtotal = 0;
- for (bufp = p, wresid = fs->st_size; ;
- bufp += wcount, wresid -= (size_t)wcount) {
- wcount = write(to_fd, bufp, wresid);
- if (wcount <= 0)
- break;
- wtotal += wcount;
- if (info) {
- info = 0;
- (void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
- }
- if (wcount >= (ssize_t)wresid)
- break;
- }
- if (wcount != (ssize_t)wresid) {
- warn("%s", to.p_path);
- rval = 1;
- }
- /* Some systems don't unmap on close(2). */
- if (munmap(p, fs->st_size) < 0) {
- warn("%s", entp->fts_path);
- rval = 1;
- }
}
} else
#endif
==== //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $
+# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
.endif
BIN1= auth.conf \
- crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
+ crontab devd.conf devfs.conf \
ddb.conf dhclient.conf disktab fbtab \
ftpusers gettytab group \
hosts hosts.allow hosts.equiv \
@@ -84,6 +84,10 @@
BIN1+= pf.os
.endif
+.if ${MK_TCSH} != "no"
+BIN1+= csh.cshrc csh.login csh.logout
+.endif
+
.if ${MK_WIRELESS} != "no"
BIN1+= regdomain.xml
.endif
@@ -148,9 +152,12 @@
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
- pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
- ${DESTDIR}/etc/master.passwd
+ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_TCSH} == "no"
+ sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd
+.endif
+ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
+ ${DESTDIR}/etc/master.passwd
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
@@ -195,14 +202,18 @@
.endif
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.profile ${DESTDIR}/root/.profile; \
+ rm -f ${DESTDIR}/.profile; \
+ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+.if ${MK_TCSH} != "no"
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.login ${DESTDIR}/root/.login; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- dot.profile ${DESTDIR}/root/.profile; \
- rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
- ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
- ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+ rm -f ${DESTDIR}/.cshrc; \
+ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
+.endif
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
.if ${MK_PPP} != "no"
==== //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -256,6 +256,7 @@
};
# The next blocks enable volume hotkeys that can be found on the Asus EeePC
+# The four keys above the keyboard notify 0x1a through to 0x1d respectively
notify 0 {
match "system" "ACPI";
match "subsystem" "ASUS-Eee";
==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#3 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.86 2008/06/23 05:09:10 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.87 2008/10/27 01:05:09 thompsa Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -913,6 +913,7 @@
else
( trap "echo Script $_file interrupted; kill -QUIT $$" 3
trap "echo Script $_file interrupted; exit 1" 2
+ trap "echo Script $_file running" 29
set $_arg; . $_file )
fi
fi
==== //depot/projects/soc2008/trasz_nfs4acl/etc/remote#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/remote,v 1.18 2008/07/21 22:38:00 marcel Exp $
+# $FreeBSD: src/etc/remote,v 1.19 2008/10/27 17:19:14 thompsa Exp $
#
# @(#)remote 5.2 (Berkeley) 6/30/90
#
@@ -66,3 +66,11 @@
uart5|com6:dv=/dev/cuau5:br#9600:pa=none:
uart6|com7:dv=/dev/cuau6:br#9600:pa=none:
uart7|com8:dv=/dev/cuau7:br#9600:pa=none:
+ucom1:dv=/dev/cuaU0:br#9600:pa=none:
+ucom2:dv=/dev/cuaU1:br#9600:pa=none:
+ucom3:dv=/dev/cuaU2:br#9600:pa=none:
+ucom4:dv=/dev/cuaU3:br#9600:pa=none:
+ucom5:dv=/dev/cuaU4:br#9600:pa=none:
+ucom6:dv=/dev/cuaU5:br#9600:pa=none:
+ucom7:dv=/dev/cuaU6:br#9600:pa=none:
+ucom8:dv=/dev/cuaU7:br#9600:pa=none:
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libcam/camlib.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $");
+__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.17 2008/10/27 21:46:58 marius Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -346,6 +346,9 @@
bzero(&ccb, sizeof(union ccb));
ccb.ccb_h.func_code = XPT_DEV_MATCH;
+ ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
+ ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
+ ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
/* Setup the result buffer */
bufsize = sizeof(struct dev_match_result);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.23 2008/10/03 09:42:50 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
@@ -47,7 +47,6 @@
#include <stdlib.h>
#include <string.h>
#include <termios.h>
-#include <unistd.h>
int
openpty(int *amaster, int *aslave, char *name, struct termios *termp,
@@ -70,9 +69,6 @@
if (slavename == NULL)
goto bad;
- if (revoke(slavename) == -1)
- goto bad;
-
slave = open(slavename, O_RDWR);
if (slave == -1)
goto bad;
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#3 (text+ko) ====
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.22 2008/10/28 13:44:11 trasz Exp $
.\"
.Dd July 24, 1996
.Os
@@ -39,16 +39,16 @@
.In sys/param.h
.In sys/vnode.h
.Ft int
-.Fn VOP_ACCESS "struct vnode *vp" "vaccess_t mode" "struct ucred *cred" "struct thread *td"
+.Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td"
.Sh DESCRIPTION
This entry point checks the access permissions of the file against the
given credentials.
.Pp
Its arguments are:
-.Bl -tag -width mode
+.Bl -tag -width accmode
.It Fa vp
The vnode of the file to check.
-.It Fa mode
+.It Fa accmode
The type of access required.
.It Fa cred
The user credentials to check.
@@ -57,8 +57,12 @@
.El
.Pp
The
-.Fa mode
-is a mask which can contain flags described in <sys/vnode.h>.
+.Fa accmode
+is a mask which can contain flags described in <sys/vnode.h>, e.g.
+.Dv VREAD ,
+.Dv VWRITE
+or
+.Dv VEXEC .
.Sh LOCKS
The vnode will be locked on entry and should remain locked on return.
.Sh RETURN VALUES
@@ -67,7 +71,7 @@
.Sh PSEUDOCODE
.Bd -literal
int
-vop_access(struct vnode *vp, vaccess_t mode, struct ucred *cred, struct thread *td)
+vop_access(struct vnode *vp, accmode_t accmode, struct ucred *cred, struct thread *td)
{
int error;
@@ -82,7 +86,7 @@
* unless the file is a socket, fifo, or a block or
* character device resident on the filesystem.
*/
- if (mode & VWRITE) {
+ if (accmode & VWRITE) {
switch (vp->v_type) {
case VDIR:
case VLNK:
@@ -95,7 +99,7 @@
}
/* If immutable bit set, nobody gets to write it. */
- if ((mode & VWRITE) && vp has immutable bit set)
+ if ((accmode & VWRITE) && vp has immutable bit set)
return EPERM;
/* Otherwise, user id 0 always gets access. */
@@ -106,11 +110,11 @@
/* Otherwise, check the owner. */
if (cred->cr_uid == owner of vp) {
- if (mode & VEXEC)
+ if (accmode & VEXEC)
mask |= S_IXUSR;
- if (mode & VREAD)
+ if (accmode & VREAD)
mask |= S_IRUSR;
- if (mode & VWRITE)
+ if (accmode & VWRITE)
mask |= S_IWUSR;
return (((mode of vp) & mask) == mask ? 0 : EACCES);
}
@@ -118,21 +122,21 @@
/* Otherwise, check the groups. */
for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
if (group of vp == *gp) {
- if (mode & VEXEC)
+ if (accmode & VEXEC)
mask |= S_IXGRP;
- if (mode & VREAD)
+ if (accmode & VREAD)
mask |= S_IRGRP;
- if (mode & VWRITE)
+ if (accmode & VWRITE)
mask |= S_IWGRP;
return (((mode of vp) & mask) == mask ? 0 : EACCES);
}
/* Otherwise, check everyone else. */
- if (mode & VEXEC)
+ if (accmode & VEXEC)
mask |= S_IXOTH;
- if (mode & VREAD)
+ if (accmode & VREAD)
mask |= S_IROTH;
- if (mode & VWRITE)
+ if (accmode & VWRITE)
mask |= S_IWOTH;
return (((mode of vp) & mask) == mask ? 0 : EACCES);
}
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#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/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $
.\"
.Dd August 22, 2001
.Os
@@ -40,7 +40,7 @@
.Fa "mode_t file_mode"
.Fa "uid_t file_uid"
.Fa "gid_t file_gid"
-.Fa "vaccess_t acc_mode"
+.Fa "accmode_t accmode"
.Fa "struct ucred *cred"
.Fa "int *privused"
.Fc
@@ -59,7 +59,7 @@
owning GID
.Fa file_gid ,
desired access mode
-.Fa acc_mode ,
+.Fa accmode ,
requesting credential
.Fa cred ,
and an optional call-by-reference
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#3 (text+ko) ====
@@ -41,7 +41,7 @@
.Fa "uid_t file_uid"
.Fa "gid_t file_gid"
.Fa "struct acl *acl"
-.Fa "vaccess_t acc_mode"
+.Fa "accmode_t accmode"
.Fa "struct ucred *cred"
.Fa "int *privused"
.Fc
@@ -59,7 +59,7 @@
access ACL for the file
.Fa acl ,
desired access mode
-.Fa acc_mode ,
+.Fa accmode ,
requesting credential
.Fa cred ,
and an optional call-by-reference
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#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/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.6 2008/10/28 13:44:11 trasz Exp $
.\"
.Dd August 22, 2001
.Os
@@ -41,7 +41,7 @@
.Fa "uid_t file_uid"
.Fa "gid_t file_gid"
.Fa "struct acl *acl"
-.Fa "vaccess_t acc_mode"
+.Fa "accmode_t accmode"
.Fa "struct ucred *cred"
.Fa "int *privused"
.Fc
@@ -59,7 +59,7 @@
access ACL for the file
.Fa acl ,
desired access mode
-.Fa acc_mode ,
+.Fa accmode ,
requesting credential
.Fa cred ,
and an optional call-by-reference
==== //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)southamerica 8.30
+# @(#)southamerica 8.33
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -193,6 +193,26 @@
# </a>
# So there is no summer time in Argentina for now.
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# </a>
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# </a>
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# </a>
+
Rule Arg 2007 only - Dec 30 0:00 1:00 S
Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
@@ -343,9 +363,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 Arg AR%sT
#
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
#
# Shanks & Pottenger also make the following claims, which we haven't verified:
# - Formosa switched to -3:00 on 1991-01-07.
@@ -364,6 +383,18 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 Arg AR%sT
#
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
# Tucuman (TM)
Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
@@ -388,7 +419,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# San Juan (SJ)
Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
@@ -401,7 +433,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Jujuy (JY)
Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
@@ -415,7 +448,8 @@
-3:00 1:00 ARST 1992
-3:00 Arg AR%sT 1999 Oct 3
-4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Catamarca (CT), Chubut (CH)
Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
@@ -428,7 +462,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Mendoza (MZ)
Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
@@ -445,7 +480,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 23
-4:00 - WART 2004 Sep 26
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# San Luis (SL)
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
@@ -473,7 +509,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -484,7 +521,8 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 30
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
# Aruba
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
==== //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)zone.tab 8.19
+# @(#)zone.tab 8.21
#
# TZ zone descriptions
#
@@ -42,14 +42,15 @@
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
-AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
-AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
+AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
AR -2411-06518 America/Argentina/Jujuy Jujuy (JY)
AR -2649-06513 America/Argentina/Tucuman Tucuman (TM)
AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH)
AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR)
AR -3132-06831 America/Argentina/San_Juan San Juan (SJ)
AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ)
+AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC)
AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF)
AS -1416-17042 Pacific/Pago_Pago
@@ -384,13 +385,13 @@
US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County
US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations
US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US +411745-0863730 America/Indiana/Knox Eastern Time - Indiana - Starke County
US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County
US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County
+US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana - Pike County
US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County
US +415100-0873900 America/Chicago Central Time
US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County
-US +382931-0871643 America/Indiana/Petersburg Central Time - Indiana - Pike County
+US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County
US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County
US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area)
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -401,7 +401,10 @@
lapic_timer_hz = hz * 2;
else
lapic_timer_hz = hz * 4;
- stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+ if (lapic_timer_hz < 128)
+ stathz = lapic_timer_hz;
+ else
+ stathz = lapic_timer_hz / (lapic_timer_hz / 128);
profhz = lapic_timer_hz;
lapic_timer_period = value / lapic_timer_hz;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#4 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -168,6 +168,42 @@
generic_armv4_bs_c_2,
NULL,
NULL,
+
+ /* read (single) stream */
+ generic_bs_r_1,
+ generic_armv4_bs_r_2,
+ generic_bs_r_4,
+ NULL,
+
+ /* read multiple stream */
+ generic_bs_rm_1,
+ generic_armv4_bs_rm_2,
+ generic_bs_rm_4,
+ NULL,
+
+ /* read region stream */
+ generic_bs_rr_1,
+ generic_armv4_bs_rr_2,
+ generic_bs_rr_4,
+ NULL,
+
+ /* write (single) stream */
+ generic_bs_w_1,
+ generic_armv4_bs_w_2,
+ generic_bs_w_4,
+ NULL,
+
+ /* write multiple stream */
+ generic_bs_wm_1,
+ generic_armv4_bs_wm_2,
+ generic_bs_wm_4,
+ NULL,
+
+ /* write region stream */
+ NULL,
+ generic_armv4_bs_wr_2,
+ generic_bs_wr_4,
+ NULL,
};
static int
@@ -534,8 +570,10 @@
case SYS_RES_MEMORY:
rle->res = rman_reserve_resource(&sc->sc_mem_rman,
start, end, count, flags, child);
- rman_set_bustag(rle->res, &at91_bs_tag);
- rman_set_bushandle(rle->res, start);
+ if (rle->res != NULL) {
+ rman_set_bustag(rle->res, &at91_bs_tag);
+ rman_set_bushandle(rle->res, start);
+ }
break;
}
if (rle->res) {
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.4 2008/10/28 13:44:11 trasz Exp $");
#include <sys/param.h>
#include <sys/priv.h>
@@ -91,17 +91,17 @@
int
secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, uint64_t owner,
- vaccess_t mode)
+ accmode_t accmode)
{
- if ((mode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) {
+ if ((accmode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) {
return (EACCES);
}
- if ((mode & VWRITE) &&
+ if ((accmode & VWRITE) &&
priv_check_cred(cred, PRIV_VFS_WRITE, 0) != 0) {
return (EACCES);
}
- if (mode & VEXEC) {
+ if (accmode & VEXEC) {
if (vp->v_type == VDIR) {
if (priv_check_cred(cred, PRIV_VFS_LOOKUP, 0) != 0) {
return (EACCES);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.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/sys/cddl/compat/opensolaris/sys/policy.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ $ $FreeBSD: src/sys/cddl/compat/opensolaris/sys/policy.h,v 1.3 2008/10/28 13:44:11 trasz Exp $
*/
#ifndef _OPENSOLARIS_SYS_POLICY_H_
@@ -46,7 +46,7 @@
int secpolicy_vnode_stky_modify(struct ucred *cred);
int secpolicy_vnode_remove(struct ucred *cred);
int secpolicy_vnode_access(struct ucred *cred, struct vnode *vp,
- uint64_t owner, vaccess_t mode);
+ uint64_t owner, accmode_t accmode);
int secpolicy_vnode_setdac(struct ucred *cred, uid_t owner);
int secpolicy_vnode_setattr(struct ucred *cred, struct vnode *vp,
struct vattr *vap, const struct vattr *ovap, int flags,
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 (text+ko) ====
@@ -237,14 +237,14 @@
zfsctl_common_access(ap)
struct vop_access_args /* {
struct vnode *a_vp;
- vaccess_t a_mode;
+ accmode_t a_accmode;
struct ucred *a_cred;
struct thread *a_td;
} */ *ap;
{
- vaccess_t mode = ap->a_mode;
+ accmode_t accmode = ap->a_accmode;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list