Fix clitests for cauthtool usage change.

diff --git a/src/test/cli/cauthtool/help.t b/src/test/cli/cauthtool/help.t
index 339e2cd3f91d6a712159363595146d75c2dd8b31..bfb8a0845406c6c8ae15b6fa05096edbacea7416 100644 (file)
--- a/src/test/cli/cauthtool/help.t
+++ b/src/test/cli/cauthtool/help.t
@@ -1,5 +1,20 @@
 # TODO synchronize with man page
   $ cauthtool --help
   no command specified
-   usage: [--create-keyring] [--gen-key] [--name=<name>] [--set-uid=uid] [--caps=<filename>] [--list] [--print-key] <filename>
+  usage: cauthtool keyringfile [OPTIONS]...
+  where the options are:
+    -l, --list                    will list all keys and capabilities present in
+                                  the keyring
+    -p, --print                   will print an encoded key for the specified
+                                  entityname. This is suitable for the
+                                  'mount -o secret=..' argument
+    -c, --create-keyring          will create a new keyring, overwriting any
+                                  existing keyringfile
+    --gen-key                     will generate a new secret key for the
+                                  specified entityname
+    --add-key                     will add an encoded key to the keyring
+    --cap subsystem capability    will set the capability for given subsystem
+    --caps capsfile               will set all of capabilities associated with a
+                                  given key, for all subsystems
+    -b, --bin                     will create a binary formatted keyring
   [1]

diff --git a/src/test/cli/cauthtool/simple.t b/src/test/cli/cauthtool/simple.t
index f016e91362ad6d99c0ce187142fd0580ffb1d8ca..015b5de8a239ab2e3200da24205b96ec127af622 100644 (file)
--- a/src/test/cli/cauthtool/simple.t
+++ b/src/test/cli/cauthtool/simple.t
@@ -1,4 +1,19 @@
   $ cauthtool
   cauthtool: must specify filename
-   usage: [--create-keyring] [--gen-key] [--name=<name>] [--set-uid=uid] [--caps=<filename>] [--list] [--print-key] <filename>
+  usage: cauthtool keyringfile [OPTIONS]...
+  where the options are:
+    -l, --list                    will list all keys and capabilities present in
+                                  the keyring
+    -p, --print                   will print an encoded key for the specified
+                                  entityname. This is suitable for the
+                                  'mount -o secret=..' argument
+    -c, --create-keyring          will create a new keyring, overwriting any
+                                  existing keyringfile
+    --gen-key                     will generate a new secret key for the
+                                  specified entityname
+    --add-key                     will add an encoded key to the keyring
+    --cap subsystem capability    will set the capability for given subsystem
+    --caps capsfile               will set all of capabilities associated with a
+                                  given key, for all subsystems
+    -b, --bin                     will create a binary formatted keyring
   [1]