RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #474 from dalgaaf/wip-da-next-fix-help

Browse Source 
Add missing commands to help/usage and manpage of ceph-authtool

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-07-28 15:26:17 -07:00
commit be73215913
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
man/ceph-authtool.8
View File

@ -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

10
src/ceph_authtool.cc
View File

@ -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"