PERFORCE change 161330 for review

[Edward Tomasz Napierala]

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

Change 161330 by trasz at trasz_victim on 2009/04/29 16:16:55

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#7 edit

Differences ...

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

@@ -90,6 +90,26 @@
 # Test removing entries.
 $ setfacl -x user:42: xxx
 $ getfacl xxx
+> # file: xxx
+> # owner: root
+> # group: wheel
+> user::rw-
+> group::r--
+> group:43:-w-
+> mask::rw-
+> other::r--
+
+$ setfacl -m u:42:r xxx
+$ getfacl -n xxx
+> # file: xxx
+> # owner: root
+> # group: wheel
+> user::rw-
+> user:42:r--
+> group::r--
+> group:43:-w-
+> mask::rw-
+> other::r--
 
 # Test removing entries by number.
 $ setfacl -x 1 xxx
@@ -223,7 +243,7 @@
 > -rw-r--r--+
 
 $ setfacl -bn nnn xxx yyy zzz
-> setfacl: stat() of nnn failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
 
 $ ls -l nnn xxx yyy zzz | cut -d' ' -f1
 > ls: nnn: No such file or directory