auth: more deglobalization

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h
index 08b6d8bb038290129500a8d00c16276cd79a3ab2..1333009f14db29063b369bf75ad2d6cbb909876c 100644 (file)
--- a/src/auth/KeyRing.h
+++ b/src/auth/KeyRing.h
@@ -54,9 +54,6 @@ public:
     secret = k->second.key;
     return true;
   }
-  void get_master(CryptoKey& dest) const {
-    get_secret(g_conf->name, dest);
-  }
 
   // modifiers
   void add(const EntityName& name, EntityAuth &a) {

diff --git a/src/auth/cephx/CephxClientHandler.cc b/src/auth/cephx/CephxClientHandler.cc
index adac94dd49c6cb6ece57c2867b170a31670979d2..5ec090a415bae7c3c0666d97ed72023010f5a762 100644 (file)
--- a/src/auth/cephx/CephxClientHandler.cc
+++ b/src/auth/cephx/CephxClientHandler.cc
@@ -45,7 +45,7 @@ int CephxClientHandler::build_request(bufferlist& bl)
     ::encode(header, bl);
 
     CryptoKey secret;
-    keyring->get_master(secret);
+    keyring->get_secret(cct->_conf->name, secret);
 
     CephXAuthenticate req;
     get_random_bytes((char *)&req.client_challenge, sizeof(req.client_challenge));
@@ -116,7 +116,7 @@ int CephxClientHandler::handle_response(int ret, bufferlist::iterator& indata)
     {
       ldout(cct, 10) << " get_auth_session_key" << dendl;
       CryptoKey secret;
-      keyring->get_master(secret);
+      keyring->get_secret(cct->_conf->name, secret);
        
       if (!tickets.verify_service_ticket_reply(secret, indata)) {
        ldout(cct, 0) << "could not verify service_ticket reply" << dendl;
@@ -153,7 +153,7 @@ int CephxClientHandler::handle_response(int ret, bufferlist::iterator& indata)
       if (rotating_secrets) {
        RotatingSecrets secrets;
        CryptoKey secret_key;
-       keyring->get_master(secret_key);
+       keyring->get_secret(cct->_conf->name, secret_key);
        std::string error;
        decode_decrypt(secrets, secret_key, indata, error);
        if (error.empty()) {

diff --git a/src/auth/none/AuthNoneProtocol.h b/src/auth/none/AuthNoneProtocol.h
index 5209fded13169f04e24d2aaad82d13cfdd8330f2..08332328c1c1e1f58e6e3ee55f22dc0c55f8fcfe 100644 (file)
--- a/src/auth/none/AuthNoneProtocol.h
+++ b/src/auth/none/AuthNoneProtocol.h
@@ -22,7 +22,6 @@ struct AuthNoneAuthorizer : public AuthAuthorizer {
   bool build_authorizer(uint64_t global_id) {
     __u8 struct_v = 1;
     ::encode(struct_v, bl);
-    ::encode(g_conf->name, bl);
     ::encode(global_id, bl);
     return 0;
   }