diff options
| author | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-01-02 21:19:35 +0100 |
|---|---|---|
| committer | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-01-02 21:19:35 +0100 |
| commit | 13e8507b73b3d16431c29fe427b094bbdf804d96 (patch) | |
| tree | 6264cce33ade04944af3cb4139274ece3af10ee7 /qa/rbd | |
| parent | osdmaptool: better error handling (diff) | |
| download | ceph-13e8507b73b3d16431c29fe427b094bbdf804d96.tar.xz ceph-13e8507b73b3d16431c29fe427b094bbdf804d96.zip | |
auth: make g_conf.keyring a plain old string
Make g_conf.keyring a plain old string rather than an array of strings.
Don't do substitution using the user's HOME variable-- this could lead
to security holes for setuid processes.
Get rid of AuthMonitor::read_keyfile because there is already a Keyring
member function, Keyring::load, that does the same thing.
qa/rbd/common.sh: we can now use cconf to figure out what the keyring
is.
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
Diffstat (limited to 'qa/rbd')
| -rw-r--r-- | qa/rbd/common.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rbd/common.sh b/qa/rbd/common.sh index aa6efe7de83..b070e7f1a2f 100644 --- a/qa/rbd/common.sh +++ b/qa/rbd/common.sh @@ -33,7 +33,7 @@ set_variables() { [ -z "$imgsize" ] && imgsize=1024 [ -z "$user" ] && user=admin - #[ -z "$keyring" ] && keyring="`$CCONF keyring`" + [ -z "$keyring" ] && keyring="`$CCONF keyring`" [ -z "$secret" ] && secret="`cauthtool $keyring -n client.$user -p`" monip="`echo $monhost | sed 's/:/ /g' | awk '{print $1}'`" |