summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2002-09-07 00:20:21 +0000
committerNathan Scott <nathans@sgi.com>2002-09-07 00:20:21 +0000
commit5dd1ce015ff50d4330b1e20000ace61177d037e1 (patch)
tree185fbf0e00d93e96bba3b4c5a46ac476b4b2c6b0
parent5f88e78bb714258af4064fba4023c2328f1fa201 (diff)
downloadacl-5dd1ce015ff50d4330b1e20000ace61177d037e1.tar.gz
Updates from AndreasG.
-rw-r--r--doc/CHANGES3
-rw-r--r--test/setfacl.test6
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 6b8ff90..68e008f 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,7 +1,8 @@
* Remove the -s and -S short options from setfacl, since it confuses
many users (--set and -set-file still exist).
+* Update the setfacl(1) manual page.
* Improve the wording of some error messages, and update the pot/po
- files.
+ files. Also update the setfacl.test script.
2.0.19 (04 September 2002)
* Correct the description of the access check algorithm in acl(5).
diff --git a/test/setfacl.test b/test/setfacl.test
index 1306a12..c3699f9 100644
--- a/test/setfacl.test
+++ b/test/setfacl.test
@@ -98,13 +98,13 @@ mask::rwx
other::---
$ setfacl --test -x u: g
-setfacl: g: Resulting ACL `user:root:---,user:joe:rw-,group::r-x,mask::rwx,other::---': Missing or wrong entry at entry 1
+setfacl: g: Malformed ACL `user:root:---,user:joe:rw-,group::r-x,mask::rwx,other::---': Missing or wrong entry at entry 1
$ setfacl --test -x u:x
setfacl: Option -x: Invalid argument near character 3
$ setfacl -m d:u:root:rwx g
-setfacl: g: Only directories can have a default ACL
+setfacl: g: Only directories can have default ACLs
$ setfacl -x m g
-setfacl: g: Resulting ACL `user::rwx,user:root:---,user:joe:rw-,group::r-x,other::---': Missing or wrong entry at entry 5
+setfacl: g: Malformed ACL `user::rwx,user:root:---,user:joe:rw-,group::r-x,other::---': Missing or wrong entry at entry 5
!setfacl --test -m d:u:joe:rwx setfacl
!setfacl --test -n -m d:u:joe:rwx setfacl
$ rm g