Merge of xfs-cmds-2.4.18:slinx:112388a by nathans.

  don't run this until I fix src/acl_test so that it only
  talks posix functions and does not rely on XFS acl internals.

diff --git a/058 b/058
index 0205c801194725a48bcc8c132977bf6df6cc1d98..639659327c0808c994029053783d88ccacfd84d5 100755 (executable)
--- a/058
+++ b/058
@@ -53,6 +53,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
+_notrun "Will not currently work with Andreas libacl"
 src/acl_test
 
 # success, all done