authtool: fix test output validation & minor whitespace.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

diff --git a/src/test/cli/ceph-authtool/help.t b/src/test/cli/ceph-authtool/help.t
index 062c967a1548ab77b9435d6160ee5f9deacfdea2..9a6c88357f7cd1088e306a33fb39e4d41befecf2 100644 (file)
--- a/src/test/cli/ceph-authtool/help.t
+++ b/src/test/cli/ceph-authtool/help.t
@@ -14,12 +14,13 @@
                                   specified entityname
     --gen-print-key               will generate a new secret key without set it
                                   to the keyringfile, prints the secret to stdout
-    --import-keyring              will import the content of a given keyring
+    --import-keyring FILE         will import the content of a given keyring
                                   into the keyringfile
-    -u, --set-uid                 sets the auid (authenticated user id) for the
+    -n NAME, --name NAME          specify entityname to operate on
+    -u AUID, --set-uid AUID       sets the auid (authenticated user id) for the
                                   specified entityname
-    -a, --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
+    -a BASE64, --add-key BASE64   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
   [1]

diff --git a/src/test/cli/ceph-authtool/manpage.t b/src/test/cli/ceph-authtool/manpage.t
index a9e1408d7163ed2146f91aa2711181e9405fc067..f84b79457a14eecb9a82d3b9edd0b248b67d4d62 100644 (file)
--- a/src/test/cli/ceph-authtool/manpage.t
+++ b/src/test/cli/ceph-authtool/manpage.t
@@ -13,13 +13,14 @@
                                   specified entityname
     --gen-print-key               will generate a new secret key without set it
                                   to the keyringfile, prints the secret to stdout
-    --import-keyring              will import the content of a given keyring
+    --import-keyring FILE         will import the content of a given keyring
                                   into the keyringfile
-    -u, --set-uid                 sets the auid (authenticated user id) for the
+    -n NAME, --name NAME          specify entityname to operate on
+    -u AUID, --set-uid AUID       sets the auid (authenticated user id) for the
                                   specified entityname
-    -a, --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
+    -a BASE64, --add-key BASE64   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
   [1]
 

diff --git a/src/test/cli/ceph-authtool/simple.t b/src/test/cli/ceph-authtool/simple.t
index b86476a5ad0f5857714cf8336aac29ca07740a52..35905ad07267dc8a1cb0346808c955332c5a1af0 100644 (file)
--- a/src/test/cli/ceph-authtool/simple.t
+++ b/src/test/cli/ceph-authtool/simple.t
@@ -13,12 +13,13 @@
                                   specified entityname
     --gen-print-key               will generate a new secret key without set it
                                   to the keyringfile, prints the secret to stdout
-    --import-keyring              will import the content of a given keyring
+    --import-keyring FILE         will import the content of a given keyring
                                   into the keyringfile
-    -u, --set-uid                 sets the auid (authenticated user id) for the
+    -n NAME, --name NAME          specify entityname to operate on
+    -u AUID, --set-uid AUID       sets the auid (authenticated user id) for the
                                   specified entityname
-    -a, --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
+    -a BASE64, --add-key BASE64   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
   [1]

diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc
index ac6a920acf5c067efe729269d9fd93257ee818d5..a213391ff49596df378557a4c7738497469ce502 100644 (file)
--- a/src/tools/ceph_authtool.cc
+++ b/src/tools/ceph_authtool.cc
@@ -39,7 +39,7 @@ void usage()
        << "                                to the keyringfile, prints the secret to stdout\n"
        << "  --import-keyring FILE         will import the content of a given keyring\n"
        << "                                into the keyringfile\n"
-       << "  -n NAME, --name NAME         specify entityname to operate on\n"
+       << "  -n NAME, --name NAME          specify entityname to operate on\n"
        << "  -u AUID, --set-uid AUID       sets the auid (authenticated user id) for the\n"
        << "                                specified entityname\n"
        << "  -a BASE64, --add-key BASE64   will add an encoded key to the keyring\n"