PERFORCE change 168313 for review

Mon Sep 7 22:47:07 UTC 2009

http://perforce.freebsd.org/chv.cgi?CH=168313

Change 168313 by trasz at trasz_anger on 2009/09/07 22:46:27

	Remove spurious diffs.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/01.t#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chmod/12.t#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#6 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/01.t#5 (text+ko) ====

@@ -1,5 +1,32 @@
 #!/bin/sh
 #
+# Copyright (c) 2008, 2009 Edward Tomasz NapieraÅ‚a <trasz at FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (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/tools/regression/acltools/01.t,v 1.1 2009/09/07 16:26:03 trasz Exp $
+#
+
 # This is a wrapper script to run tools-nfs4.test on ZFS filesystem.
 #
 # WARNING: It uses hardcoded ZFS pool name "acltools"
@@ -57,4 +84,3 @@
 mdconfig -du $MD
 
 echo "ok 4"
-

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#11 (text+ko) ====

@@ -1,3 +1,30 @@
+# Copyright (c) 2008, 2009 Edward Tomasz NapieraÅ‚a <trasz at FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (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/tools/regression/acltools/tools-nfs4.test,v 1.1 2009/09/07 16:26:03 trasz Exp $
+#
+
 # This is a tools-level test for NFSv4 ACL functionality.  Run it as root
 # using ACL-enabled kernel:
 #
@@ -187,7 +214,7 @@
 > -rw-r--r--
 
 $ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz
-> setfacl: nnn: acl_get_file() failed: No such file or directory
+> setfacl: nnn: stat() failed: No such file or directory
 
 $ ls -l nnn xxx yyy zzz | cut -d' ' -f1
 > ls: nnn: No such file or directory
@@ -225,7 +252,7 @@
 >          everyone@:r-----a-R-c--s:------:allow
 
 $ setfacl -b nnn xxx yyy zzz
-> setfacl: nnn: acl_get_file() failed: No such file or directory
+> setfacl: nnn: stat() failed: No such file or directory
 
 $ ls -l nnn xxx yyy zzz | cut -d' ' -f1
 > ls: nnn: No such file or directory

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chmod/12.t#3 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/12.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="verify SUID/SGID bit behaviour"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#5 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/00.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#4 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/01.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#7 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/02.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#6 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/03.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#5 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/04.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER"
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#6 (text+ko) ====

@@ -1,4 +1,5 @@
 #!/bin/sh
+# $FreeBSD: src/tools/regression/fstest/tests/granular/05.t,v 1.1 2009/09/07 19:40:22 trasz Exp $
 
 desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD with directories"
 
