diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-28 15:26:17 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-28 15:26:17 -0700 |
| commit | be7321591389248defcd8fed4622af7862999d91 (patch) | |
| tree | 7c62fcd14a9a0c82f4dc4e7164d112056fb62a88 | |
| parent | 4b6c569a1143d997724fbce57fdf8ae9099ebc1a (diff) | |
| parent | 347b5a207846fe058d2deb19c976df810bc0c922 (diff) | |
| download | ceph-be7321591389248defcd8fed4622af7862999d91.tar.gz | |
Merge pull request #474 from dalgaaf/wip-da-next-fix-help
Add missing commands to help/usage and manpage of ceph-authtool
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | man/ceph-authtool.8 | 21 | ||||
| -rw-r--r-- | src/ceph_authtool.cc | 10 |
2 files changed, 27 insertions, 4 deletions
diff --git a/man/ceph-authtool.8 b/man/ceph-authtool.8 index 47888af1f22..e64cac95f0a 100644 --- a/man/ceph-authtool.8 +++ b/man/ceph-authtool.8 @@ -69,16 +69,33 @@ will create a new keyring, overwriting any existing keyringfile .UNINDENT .INDENT 0.0 .TP -.B \-\-gen\-key +.B \-g, \-\-gen\-key will generate a new secret key for the specified entityname .UNINDENT .INDENT 0.0 .TP -.B \-\-add\-key +.B \-a, \-\-add\-key will add an encoded key to the keyring .UNINDENT .INDENT 0.0 .TP +.B \-u, \-\-set\-uid +sets the auid (authenticated user id) for the specified entityname +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-gen\-print\-key +will generate and print a new secret key without adding it to the keyringfile + +NOTE: will work without a given keyringfile +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-import\-keyring +will import the content of a given keyring into the keyringfile +.UNINDENT +.INDENT 0.0 +.TP .B \-\-cap subsystem capability will set the capability for given subsystem .UNINDENT diff --git a/src/ceph_authtool.cc b/src/ceph_authtool.cc index 3075d9c69a7..f66a3c66eee 100644 --- a/src/ceph_authtool.cc +++ b/src/ceph_authtool.cc @@ -36,9 +36,15 @@ void usage() << " 'mount -o secret=..' argument\n" << " -C, --create-keyring will create a new keyring, overwriting any\n" << " existing keyringfile\n" - << " --gen-key will generate a new secret key for the\n" + << " -g, --gen-key will generate a new secret key for the\n" << " specified entityname\n" - << " --add-key will add an encoded key to the keyring\n" + << " --gen-print-key will generate a new secret key without set it\n" + << " to the keyringfile, prints the secret to stdout\n" + << " --import-keyring will import the content of a given keyring\n" + << " into the keyringfile\n" + << " -u, --set-uid sets the auid (authenticated user id) for the\n" + << " specified entityname\n" + << " -a, --add-key will add an encoded key to the keyring\n" << " --cap subsystem capability will set the capability for given subsystem\n" << " --caps capsfile will set all of capabilities associated with a\n" << " given key, for all subsystems" |