]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
auth: make g_conf.keyring a plain old string
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Sun, 2 Jan 2011 20:19:35 +0000 (12:19 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Sun, 2 Jan 2011 20:19:35 +0000 (12:19 -0800)
commit13e8507b73b3d16431c29fe427b094bbdf804d96
tree6264cce33ade04944af3cb4139274ece3af10ee7
parent789cb9a403839c395db652d226f411aa7fc14a61
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>
qa/rbd/common.sh
src/auth/KeyRing.cc
src/auth/KeyRing.h
src/common/common_init.cc
src/config.cc
src/mon/AuthMonitor.cc
src/mon/AuthMonitor.h