From: Robin H. Johnson <robin.johnson@dreamhost.com>
Date: Wed, 6 Apr 2016 16:42:54 +0000 (-0700)
Subject: authtool: fix test output validation & minor whitespace.
X-Git-Tag: v10.1.2~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8456%2Fhead;p=ceph.git

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 062c967a154..9a6c88357f7 100644
--- 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 a9e1408d716..f84b79457a1 100644
--- 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 b86476a5ad0..35905ad0726 100644
--- 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 ac6a920acf5..a213391ff49 100644
--- 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"