PERFORCE change 155961 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun Jan 11 07:02:19 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=155961
Change 155961 by trasz at trasz_victim7 on 2009/01/11 14:55:34
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Makefile.inc#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libmd/mdX.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/redzone.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/pci_vendors#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_pci.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pass.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sa.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ses.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sg.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/Makefile.arm#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/md/md.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/mixer.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet6.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_ifoff/mac_ifoff.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_none/mac_none.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_partition/mac_partition.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_portacl/mac_portacl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/soundcard.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/Files/root/.profile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/G2348#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/G2358#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/avila#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cambria#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/motd#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/rc.conf#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/ssh/sshd_config#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/common#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csplit/csplit.1#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/pkg_add.1#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#8 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#5 (text+ko) ====
@@ -1,3 +1,11 @@
+ --- 9.4.3-P1 released ---
+
+2522. [security] Handle -1 from DSA_do_verify().
+
+2498. [bug] Removed a bogus function argument used with
+ ISC_SOCKET_USE_POLLWATCH: it could cause compiler
+ warning or crash named with the debug 1 level
+ of logging. [RT #18917]
--- 9.4.3 released ---
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#5 (text+ko) ====
@@ -1,3 +1,3 @@
LIBINTERFACE = 36
-LIBREVISION = 1
+LIBREVISION = 2
LIBAGE = 0
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldsa_link.c#2 (text+ko) ====
@@ -16,7 +16,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: openssldsa_link.c,v 1.1.6.9 2007/08/28 07:20:04 tbox Exp $ */
+/* $Id: openssldsa_link.c,v 1.1.6.9.28.1 2008/12/24 00:21:22 marka Exp $ */
#ifdef OPENSSL
@@ -133,7 +133,7 @@
status = DSA_do_verify(digest, ISC_SHA1_DIGESTLENGTH, dsasig, dsa);
DSA_SIG_free(dsasig);
- if (status == 0)
+ if (status != 1)
return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
return (ISC_R_SUCCESS);
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ====
@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.6.11.58.1 2008/12/24 00:21:22 marka Exp $
*/
#ifdef OPENSSL
@@ -246,7 +246,7 @@
status = RSA_verify(type, digest, digestlen, sig->base,
RSA_size(rsa), rsa);
- if (status == 0)
+ if (status != 1)
return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
return (ISC_R_SUCCESS);
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#4 (text+ko) ====
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */
+/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */
/*! \file */
@@ -501,7 +501,7 @@
if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
(void *)&on, sizeof(on)) < 0) {
-
+
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_RECVPKTINFO) "
"%s: %s", sock->fd,
@@ -3163,7 +3163,6 @@
ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_SOCKET,
ISC_LOG_DEBUG(1),
- ISC_LOG_INFO,
"unexpected POLL timeout");
}
pollstate = poll_active;
@@ -4902,7 +4901,7 @@
if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
(void *)&onoff, sizeof(int)) < 0) {
char strbuf[ISC_STRERRORSIZE];
-
+
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_V6ONLY) "
"%s: %s", sock->fd,
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $Id: version,v 1.29.134.23 2008/11/12 04:17:12 marka Exp $
+# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=4
PATCHVER=3
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1
==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#9 (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.347 2009/01/06 22:18:24 bz Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.348 2009/01/08 23:27:59 keramida Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -570,7 +570,7 @@
ldconfig_local32_dirs="/usr/local/libdata/ldconfig32"
# Local directories with 32-bit compatibility ldconfig
# configuration files.
-kern_securelevel_enable="NO" # kernel security level (see init(8)),
+kern_securelevel_enable="NO" # kernel security level (see security(7))
kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure
# Note that setting securelevel to 0 will result
# in the system booting with securelevel set to 1, as
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.41 2008/12/06 09:37:54 kib Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.42 2009/01/09 16:24:10 ru Exp $
.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
@@ -35,34 +35,45 @@
strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
wcswidth.3 wcsxfrm.3 wmemchr.3
-MLINKS+=ffs.3 ffsl.3
-MLINKS+=ffs.3 fls.3
-MLINKS+=ffs.3 flsl.3
-MLINKS+=ffs.3 ffsll.3
-MLINKS+=ffs.3 flsll.3
+MLINKS+=ffs.3 ffsl.3 \
+ ffs.3 ffsll.3 \
+ ffs.3 fls.3 \
+ ffs.3 flsl.3 \
+ ffs.3 flsll.3
MLINKS+=index.3 rindex.3
MLINKS+=memchr.3 memrchr.3
MLINKS+=strcasecmp.3 strncasecmp.3
MLINKS+=strcat.3 strncat.3
MLINKS+=strchr.3 strrchr.3
MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strcpy.3 stpcpy.3
+MLINKS+=strcpy.3 stpcpy.3 \
+ strcpy.3 strncpy.3
MLINKS+=strdup.3 strndup.3
-MLINKS+=strcpy.3 strncpy.3
-MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
-MLINKS+=strerror.3 strerror_r.3
+MLINKS+=strerror.3 perror.3 \
+ strerror.3 strerror_r.3 \
+ strerror.3 sys_errlist.3 \
+ strerror.3 sys_nerr.3
MLINKS+=strlcpy.3 strlcat.3
+MLINKS+=strstr.3 strcasestr.3 \
+ strstr.3 strnstr.3
MLINKS+=strtok.3 strtok_r.3
-MLINKS+=strstr.3 strcasestr.3
-MLINKS+=strstr.3 strnstr.3
-MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
- wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
- wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
- wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
- wmemchr.3 wcscspn.3 wmemchr.3 wcsdup.3 \
+MLINKS+=wmemchr.3 wcscat.3 \
+ wmemchr.3 wcschr.3 \
+ wmemchr.3 wcscmp.3 \
+ wmemchr.3 wcscpy.3 \
+ wmemchr.3 wcscspn.3 \
+ wmemchr.3 wcsdup.3 \
wmemchr.3 wcslcat.3 \
- wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
- wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
- wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
- wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
- wmemchr.3 wcsstr.3
+ wmemchr.3 wcslcpy.3 \
+ wmemchr.3 wcslen.3 \
+ wmemchr.3 wcsncat.3 \
+ wmemchr.3 wcsncmp.3 \
+ wmemchr.3 wcsncpy.3 \
+ wmemchr.3 wcspbrk.3 \
+ wmemchr.3 wcsrchr.3 \
+ wmemchr.3 wcsspn.3 \
+ wmemchr.3 wcsstr.3 \
+ wmemchr.3 wmemcmp.3 \
+ wmemchr.3 wmemcpy.3 \
+ wmemchr.3 wmemmove.3 \
+ wmemchr.3 wmemset.3
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libmd/mdX.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ----------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.30 2006/01/17 15:35:56 phk Exp $
+.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.31 2009/01/09 11:45:13 phk Exp $
.\"
.Dd February 11, 1999
.Dt MDX 3
@@ -164,11 +164,6 @@
.%O RFC 1321
.Re
.Rs
-.%A RSA Laboratories
-.%T Frequently Asked Questions About today's Cryptography
-.%O \&<http://www.rsa.com/rsalabs/faq/>
-.Re
-.Rs
.%A H. Dobbertin
.%T Alf Swindles Ann
.%J CryptoBytes
==== //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ====
@@ -17,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1098 2008/11/24 01:26:22 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1099 2009/01/09 03:52:12 murray Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -29,6 +29,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
+ <year>2009</year>
<holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
@@ -347,6 +348,12 @@
<para>The &man.fdopendir.3; library function has been added.</para>
+ <para role="merged">The &man.fetch.3; library now support HTTP 1.1
+ If-Modified-Since behavior. The &man.fetch.1; program now
+ supports <option>-i <replaceable>filename</replaceable></option>
+ which will only download the specified HTTP URL if the content
+ is newer than <replaceable>filename</replaceable>.</para>
+
<para>&man.find.1; has been enhanced by the addition of a number
of primaries that were present in GNU find but not &os;
&man.find.1;.</para>
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.8#3 (text+ko) ====
@@ -39,7 +39,7 @@
.\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93
.\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
.\"
-.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.43 2008/06/21 15:04:42 marck Exp $
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.44 2009/01/10 17:17:18 trasz Exp $
.\"
.Dd June 21, 2008
.Dt MDCONFIG 8
@@ -62,6 +62,7 @@
.Nm
.Fl d
.Fl u Ar unit
+.Op Fl o Oo Cm no Oc Ns Ar force
.Nm
.Fl l
.Op Fl n
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.c#3 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.56 2008/06/21 15:04:42 marck Exp $
+ * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.57 2009/01/10 17:17:18 trasz Exp $
*
*/
#include <sys/param.h>
@@ -58,7 +58,7 @@
"usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n"
" [-s size] [-S sectorsize] [-u unit]\n"
" [-x sectors/track] [-y heads/cyl]\n"
-" mdconfig -d -u unit\n"
+" mdconfig -d -u unit [-o [no]force]\n"
" mdconfig -l [-v] [-n] [-u unit]\n");
fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n");
fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n");
@@ -160,6 +160,16 @@
close(fd);
break;
case 'o':
+ if (action == DETACH) {
+ if (!strcmp(optarg, "force"))
+ mdio.md_options |= MD_FORCE;
+ else if (!strcmp(optarg, "noforce"))
+ mdio.md_options &= ~MD_FORCE;
+ else
+ errx(1, "Unknown option: %s.", optarg);
+ break;
+ }
+
if (cmdline != 2)
usage();
if (!strcmp(optarg, "async"))
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/mount/mount.c,v 1.102 2008/12/26 22:55:38 obrien Exp $";
+ "$FreeBSD: src/sbin/mount/mount.c,v 1.103 2009/01/10 20:54:47 obrien Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -68,16 +68,21 @@
#define MOUNT_META_OPTION_FSTAB "fstab"
#define MOUNT_META_OPTION_CURRENT "current"
-#define MAX_ARGS 100
+int debug, fstab_style, verbose;
-int debug, fstab_style, verbose;
+#define MAX_ARGS 100
+struct cpa {
+ char *a[MAX_ARGS];
+ ssize_t m;
+ int c;
+};
char *catopt(char *, const char *);
struct statfs *getmntpt(const char *);
int hasopt(const char *, const char *);
int ismounted(struct fstab *, struct statfs *, int);
int isremountable(const char *);
-void mangle(char *, int *, char *[]);
+void mangle(char *, struct cpa *);
char *update_options(char *, char *, int);
int mountfs(const char *, const char *, const char *,
int, const char *, const char *);
@@ -500,12 +505,20 @@
return (found);
}
+static void
+append_arg(struct cpa *sa, char *arg)
+{
+ if (sa->c >= sa->m)
+ errx(1, "Cannot process more than %zd mount arguments", sa->m);
+
+ sa->a[++sa->c] = arg;
+}
+
int
mountfs(const char *vfstype, const char *spec, const char *name, int flags,
const char *options, const char *mntopts)
{
- static int argc;
- char *argv[MAX_ARGS];
+ struct cpa mnt_argv;
struct statfs sf;
int i, ret;
char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX];
@@ -543,32 +556,29 @@
/* Construct the name of the appropriate mount command */
(void)snprintf(execname, sizeof(execname), "mount_%s", vfstype);
- argc = 0;
- argv[argc++] = execname;
- mangle(optbuf, &argc, argv);
- argv[argc++] = strdup(spec);
- argv[argc++] = strdup(name);
- argv[argc] = NULL;
-
- if (MAX_ARGS <= argc )
- errx(1, "Cannot process more than %d mount arguments",
- MAX_ARGS);
+ mnt_argv.m = MAX_ARGS;
+ mnt_argv.c = -1;
+ append_arg(&mnt_argv, execname);
+ mangle(optbuf, &mnt_argv);
+ append_arg(&mnt_argv, strdup(spec));
+ append_arg(&mnt_argv, strdup(name));
+ append_arg(&mnt_argv, NULL);
if (debug) {
if (use_mountprog(vfstype))
printf("exec: mount_%s", vfstype);
else
printf("mount -t %s", vfstype);
- for (i = 1; i < argc; i++)
- (void)printf(" %s", argv[i]);
+ for (i = 1; i < mnt_argv.c; i++)
+ (void)printf(" %s", mnt_argv.a[i]);
(void)printf("\n");
return (0);
}
if (use_mountprog(vfstype)) {
- ret = exec_mountprog(name, execname, argv);
+ ret = exec_mountprog(name, execname, mnt_argv.a);
} else {
- ret = mount_fs(vfstype, argc, argv);
+ ret = mount_fs(vfstype, mnt_argv.c, mnt_argv.a);
}
free(optbuf);
@@ -671,12 +681,10 @@
}
void
-mangle(char *options, int *argcp, char *argv[])
+mangle(char *options, struct cpa *a)
{
char *p, *s;
- int argc;
- argc = *argcp;
for (s = options; (p = strsep(&s, ",")) != NULL;)
if (*p != '\0') {
if (strcmp(p, "noauto") == 0) {
@@ -708,19 +716,17 @@
sizeof(groupquotaeq) - 1) == 0) {
continue;
} else if (*p == '-') {
- argv[argc++] = p;
+ append_arg(a, p);
p = strchr(p, '=');
if (p != NULL) {
*p = '\0';
- argv[argc++] = p+1;
+ append_arg(a, p + 1);
}
} else {
- argv[argc++] = strdup("-o");
- argv[argc++] = p;
+ append_arg(a, strdup("-o"));
+ append_arg(a, p);
}
}
-
- *argcp = argc;
}
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#5 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.349 2008/09/24 21:07:11 des Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.350 2009/01/08 23:50:32 keramida Exp $
.\"
-.Dd September 24, 2008
+.Dd January 9, 2009
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3188,7 +3188,7 @@
ranges from \-1 (the compile time default) to 3 (the
most secure).
See
-.Xr init 8
+.Xr security 7
for the list of possible security levels and their effect
on system operation.
.It Va sshd_program
@@ -3987,6 +3987,7 @@
.Xr motd 5 ,
.Xr newsyslog.conf 5 ,
.Xr pf.conf 5 ,
+.Xr security 7 ,
.Xr accton 8 ,
.Xr amd 8 ,
.Xr apm 8 ,
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/redzone.9#2 (text+ko) ====
@@ -22,15 +22,17 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/redzone.9,v 1.1 2006/01/31 11:09:20 pjd Exp $
+.\" $FreeBSD: src/share/man/man9/redzone.9,v 1.2 2009/01/09 14:41:36 brueffer Exp $
.\"
-.Dd January 31, 2006
+.Dd January 9, 2009
.Dt REDZONE 9
.Os
.Sh NAME
.Nm RedZone
.Nd "buffer corruptions detector"
.Sh SYNOPSIS
+.Cd "options KDB"
+.Cd "options DDB"
.Cd "options DEBUG_REDZONE"
.Sh DESCRIPTION
.Nm
==== //depot/projects/soc2008/trasz_nfs4acl/share/misc/pci_vendors#2 (text+ko) ====
@@ -1,4 +1,4 @@
-; $FreeBSD: src/share/misc/pci_vendors,v 1.37 2008/01/17 19:29:01 ambrisko Exp $
+; $FreeBSD: src/share/misc/pci_vendors,v 1.38 2009/01/10 16:24:58 kib Exp $
;
; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl
; (with the -l option), using the following source lists:
@@ -4606,7 +4606,7 @@
6041 MV88SX6041 Marvell Technology Group Ltd. MV88SX6041 4-port SATA II PCI-X Controller (rev 03)
6042 MV88SX6042 4-port SATA II PCI-X Controller
6081 MV88SX6081 8-port SATA II PCI-X Controller
- 6101 6101 SATA2 Controller
+ 6101 MV88SX6101 1-port UltraATA/133 Controller
6111 6111 SATA2 Controller
6120 6120 SATA2 Controller
6121 6121 SATA2 Controller
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#4 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.24 2008/12/20 03:26:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -358,7 +358,7 @@
};
-struct cpu_functions feroceon_cpufuncs = {
+struct cpu_functions sheeva_cpufuncs = {
/* CPU functions */
cpufunc_id, /* id */
@@ -368,7 +368,7 @@
cpufunc_control, /* control */
cpufunc_domains, /* Domain */
- feroceon_setttb, /* Setttb */
+ sheeva_setttb, /* Setttb */
cpufunc_faultstatus, /* Faultstatus */
cpufunc_faultaddress, /* Faultaddress */
@@ -387,17 +387,17 @@
armv5_ec_icache_sync_range, /* icache_sync_range */
armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */
- feroceon_dcache_wbinv_range, /* dcache_wbinv_range */
- feroceon_dcache_inv_range, /* dcache_inv_range */
- feroceon_dcache_wb_range, /* dcache_wb_range */
+ sheeva_dcache_wbinv_range, /* dcache_wbinv_range */
+ sheeva_dcache_inv_range, /* dcache_inv_range */
+ sheeva_dcache_wb_range, /* dcache_wb_range */
armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */
- feroceon_idcache_wbinv_range, /* idcache_wbinv_all */
+ sheeva_idcache_wbinv_range, /* idcache_wbinv_all */
- feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */
- feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */
- feroceon_l2cache_inv_range, /* l2cache_inv_range */
- feroceon_l2cache_wb_range, /* l2cache_wb_range */
+ sheeva_l2cache_wbinv_all, /* l2cache_wbinv_all */
+ sheeva_l2cache_wbinv_range, /* l2cache_wbinv_range */
+ sheeva_l2cache_inv_range, /* l2cache_inv_range */
+ sheeva_l2cache_wb_range, /* l2cache_wb_range */
/* Other functions */
@@ -1000,7 +1000,7 @@
cputype == CPU_ID_MV88FR571_VD ||
cputype == CPU_ID_MV88FR571_41) {
- cpufuncs = feroceon_cpufuncs;
+ cpufuncs = sheeva_cpufuncs;
/*
* Workaround for Marvell MV78100 CPU: Cache prefetch
* mechanism may affect the cache coherency validity,
@@ -1011,12 +1011,12 @@
*/
if (cputype == CPU_ID_MV88FR571_VD ||
cputype == CPU_ID_MV88FR571_41) {
- feroceon_control_ext(0xffffffff,
+ sheeva_control_ext(0xffffffff,
FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN |
FC_L2_PREF_DIS);
} else {
- feroceon_control_ext(0xffffffff,
+ sheeva_control_ext(0xffffffff,
FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN);
}
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_trampoline.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.23 2009/01/09 10:45:04 raj Exp $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -74,7 +74,7 @@
#ifdef CPU_XSCALE_81342
#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
-#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all
+#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all
#else
#define cpu_l2cache_wbinv_all()
#endif
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/cpufunc.h#3 (text+ko) ====
@@ -38,7 +38,7 @@
*
* Prototypes for cpu, mmu and tlb related functions.
*
- * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.14 2008/10/13 18:16:54 raj Exp $
+ * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.15 2009/01/09 10:45:04 raj Exp $
*/
#ifndef _MACHINE_CPUFUNC_H_
@@ -377,17 +377,17 @@
extern unsigned arm10_dcache_index_max;
extern unsigned arm10_dcache_index_inc;
-u_int feroceon_control_ext (u_int, u_int);
-void feroceon_setttb (u_int);
-void feroceon_dcache_wbinv_range (vm_offset_t, vm_size_t);
-void feroceon_dcache_inv_range (vm_offset_t, vm_size_t);
-void feroceon_dcache_wb_range (vm_offset_t, vm_size_t);
-void feroceon_idcache_wbinv_range (vm_offset_t, vm_size_t);
+u_int sheeva_control_ext (u_int, u_int);
+void sheeva_setttb (u_int);
+void sheeva_dcache_wbinv_range (vm_offset_t, vm_size_t);
+void sheeva_dcache_inv_range (vm_offset_t, vm_size_t);
+void sheeva_dcache_wb_range (vm_offset_t, vm_size_t);
+void sheeva_idcache_wbinv_range (vm_offset_t, vm_size_t);
-void feroceon_l2cache_wbinv_range (vm_offset_t, vm_size_t);
-void feroceon_l2cache_inv_range (vm_offset_t, vm_size_t);
-void feroceon_l2cache_wb_range (vm_offset_t, vm_size_t);
-void feroceon_l2cache_wbinv_all (void);
+void sheeva_l2cache_wbinv_range (vm_offset_t, vm_size_t);
+void sheeva_l2cache_inv_range (vm_offset_t, vm_size_t);
+void sheeva_l2cache_wb_range (vm_offset_t, vm_size_t);
+void sheeva_l2cache_wbinv_all (void);
#endif
#ifdef CPU_ARM11
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/arm/mv/files.mv,v 1.2 2008/11/19 11:30:44 raj Exp $
+# $FreeBSD: src/sys/arm/mv/files.mv,v 1.3 2009/01/09 10:55:33 raj Exp $
#
# The Marvell CPU cores
# - Compliant with V5TE architecture
@@ -15,7 +15,7 @@
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_arm10.S standard
arm/arm/cpufunc_asm_armv5_ec.S standard
-arm/arm/cpufunc_asm_feroceon.S standard
+arm/arm/cpufunc_asm_sheeva.S standard
arm/arm/irq_dispatch.S standard
arm/mv/bus_space.c standard
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_pci.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.3 2008/12/05 15:27:28 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.5 2009/01/09 12:38:41 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,6 +80,7 @@
#define PCIE_REG_STATUS 0x1A04
#define PCIE_REG_IRQ_MASK 0x1910
+#define STATUS_LINK_DOWN 1
#define STATUS_BUS_OFFS 8
#define STATUS_BUS_MASK (0xFF << STATUS_BUS_OFFS)
#define STATUS_DEV_OFFS 16
@@ -95,10 +96,12 @@
struct pcib_mbus_softc {
device_t sc_dev;
+ struct rman sc_iomem_rman;
bus_addr_t sc_iomem_base;
bus_addr_t sc_iomem_size;
bus_addr_t sc_iomem_alloc; /* Next allocation. */
+ struct rman sc_ioport_rman;
bus_addr_t sc_ioport_base;
bus_addr_t sc_ioport_size;
bus_addr_t sc_ioport_alloc; /* Next allocation. */
@@ -434,6 +437,8 @@
P2P_CONF_DEV_OFFS;
} else {
val = bus_space_read_4(sc->sc_bst, sc->sc_bsh, PCIE_REG_STATUS);
+ if (val & STATUS_LINK_DOWN)
+ goto out;
bus = sc->sc_busnr = (val & STATUS_BUS_MASK) >> STATUS_BUS_OFFS;
dev = sc->sc_devnr = (val & STATUS_DEV_MASK) >> STATUS_DEV_OFFS;
}
@@ -521,12 +526,39 @@
sc->sc_ioport_size = sc->sc_info->op_io_size;
sc->sc_ioport_alloc = sc->sc_info->op_io_base;
+ sc->sc_iomem_rman.rm_type = RMAN_ARRAY;
+ err = rman_init(&sc->sc_iomem_rman);
+ if (err)
+ return (err);
+
+ sc->sc_ioport_rman.rm_type = RMAN_ARRAY;
+ err = rman_init(&sc->sc_ioport_rman);
+ if (err) {
+ rman_fini(&sc->sc_iomem_rman);
+ return (err);
+ }
+
+ err = rman_manage_region(&sc->sc_iomem_rman, sc->sc_iomem_base,
+ sc->sc_iomem_base + sc->sc_iomem_size - 1);
+ if (err)
+ goto error;
+
+ err = rman_manage_region(&sc->sc_ioport_rman, sc->sc_ioport_base,
+ sc->sc_ioport_base + sc->sc_ioport_size - 1);
+ if (err)
+ goto error;
+
err = pcib_mbus_init(sc, sc->sc_busnr, pcib_mbus_maxslots(sc->sc_dev));
if (err)
- return(err);
+ goto error;
device_add_child(self, "pci", -1);
return (bus_generic_attach(self));
+
+error:
+ rman_fini(&sc->sc_iomem_rman);
+ rman_fini(&sc->sc_ioport_rman);
+ return (err);
}
static int
@@ -570,7 +602,7 @@
return (width);
addr = (*allocp + mask) & ~mask;
- if ((*allocp = addr + size) >= limit)
+ if ((*allocp = addr + size) > limit)
return (-1);
if (bootverbose)
@@ -634,8 +666,10 @@
pcib_mbus_init_resources(struct pcib_mbus_softc *sc, int bus, int slot,
int func, int hdrtype)
{
+ const struct obio_pci_irq_map *map = sc->sc_info->op_pci_irq_map;
int maxbar = (hdrtype & PCIM_HDRTYPE) ? 0 : 6;
- int bar = 0, irq, pin, i;
+ int bar = 0, irq = -1;
+ int pin, i;
/* Program the base address registers */
while (bar < maxbar) {
@@ -652,8 +686,14 @@
pin = pcib_mbus_read_config(sc->sc_dev, bus, slot, func,
PCIR_INTPIN, 1);
- if (sc->sc_info->op_get_irq != NULL)
- irq = sc->sc_info->op_get_irq(bus, slot, func, pin);
+ if (map != NULL)
+ while (map->opim_irq >= 0) {
+ if ((map->opim_slot == slot || map->opim_slot < 0) &&
+ (map->opim_pin == pin || map->opim_pin < 0))
+ irq = map->opim_irq;
+
+ map++;
+ }
else
irq = sc->sc_info->op_irq;
@@ -728,9 +768,37 @@
pcib_mbus_alloc_resource(device_t dev, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
{
+ struct pcib_mbus_softc *sc = device_get_softc(dev);
+ struct rman *rm = NULL;
+ struct resource *res;
- return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child,
- type, rid, start, end, count, flags));
+ switch (type) {
+ case SYS_RES_IOPORT:
+ rm = &sc->sc_ioport_rman;
+ break;
+ case SYS_RES_MEMORY:
+ rm = &sc->sc_iomem_rman;
+ break;
+ default:
+ return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child,
+ type, rid, start, end, count, flags));
+ };
+
+ res = rman_reserve_resource(rm, start, end, count, flags, child);
+ if (res == NULL)
+ return (NULL);
+
+ rman_set_rid(res, *rid);
+ rman_set_bustag(res, obio_tag);
+ rman_set_bushandle(res, start);
+
+ if (flags & RF_ACTIVE)
+ if (bus_activate_resource(child, type, *rid, res)) {
+ rman_release_resource(res);
+ return (NULL);
+ }
+
+ return (res);
}
static int
@@ -738,8 +806,11 @@
struct resource *res)
{
- return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
- type, rid, res));
+ if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY)
+ return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
+ type, rid, res));
+
+ return (rman_release_resource(res));
}
static int
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#4 (text+ko) ====
@@ -34,7 +34,7 @@
*
* from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0var.h, rev 1
*
- * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.4 2009/01/08 18:31:43 raj Exp $
+ * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.5 2009/01/09 10:20:51 raj Exp $
*/
#ifndef _MVVAR_H_
@@ -63,7 +63,11 @@
struct resource_list od_resources;
};
-typedef int (*obio_get_irq_t)(u_int bus, u_int slot, u_int func, u_int pin);
+struct obio_pci_irq_map {
+ int opim_slot;
+ int opim_pin;
+ int opim_irq;
+};
struct obio_pci {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list