From: Sage Weil <sage@newdream.net>
Date: Tue, 8 May 2012 23:24:12 +0000 (-0700)
Subject: keyring: make child of KeyStore
X-Git-Tag: v0.48argonaut~137^2~38^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80bbe5e4fd93ed42fd2dcc342bbf159058316654;p=ceph.git

keyring: make child of KeyStore

This lets us pass a keyring to the auth methods as a source for keys for
doing the authentication handshaking.  Normally we pass a RotatatingKeyring
or the KeyServer, but for mon->mon we don't use a service key.  This will
let us use a simple KeyRing for that.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h
index cfac054b28f8..4771ff22f634 100644
--- a/src/auth/KeyRing.h
+++ b/src/auth/KeyRing.h
@@ -22,7 +22,7 @@
 
 class md_config_t;
 
-class KeyRing {
+class KeyRing : public KeyStore {
   map<EntityName, EntityAuth> keys;
 
   int set_modifier(const char *type, const char *val, EntityName& name, map<string, bufferlist>& caps);
@@ -54,6 +54,10 @@ public:
     secret = k->second.key;
     return true;
   }
+  bool get_service_secret(uint32_t service_id, uint64_t secret_id,
+			  CryptoKey& secret) const {
+    return false;
+  }
 
   // modifiers
   void add(const EntityName& name, EntityAuth &a) {