auth: AuthBlob -> CephXTicketBlob

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 3f3434f960db7facbbe0280495986abdabe416aa..995fa6ca895306f32510f49b5110105b0283c590 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -181,22 +181,6 @@ struct AuthTicket {
 };
 WRITE_CLASS_ENCODER(AuthTicket)
 
-struct AuthBlob {
-  uint64_t secret_id;
-  bufferlist blob;
-
-  void encode(bufferlist& bl) const {
-    ::encode(secret_id, bl);
-    ::encode(blob, bl);
-  }
-
-  void decode(bufferlist::iterator& bl) {
-    ::decode(secret_id, bl);
-    ::decode(blob, bl);
-  }
-};
-WRITE_CLASS_ENCODER(AuthBlob);
-
 
 /*
  * abstract authorizer class

diff --git a/src/auth/cephx/CephxProtocol.h b/src/auth/cephx/CephxProtocol.h
index c2ecbba8202af318df80cbdf0ca602bb2424a28d..ae1ed1e0a50c511d7547f4eb0f6055ec4be9c164 100644 (file)
--- a/src/auth/cephx/CephxProtocol.h
+++ b/src/auth/cephx/CephxProtocol.h
@@ -227,13 +227,31 @@ struct CephXAuthorizer : public AuthAuthorizer {
   bool verify_reply(bufferlist::iterator& reply);
 };
 
+
+struct CephXTicketBlob {
+  uint64_t secret_id;
+  bufferlist blob;
+
+  void encode(bufferlist& bl) const {
+    ::encode(secret_id, bl);
+    ::encode(blob, bl);
+  }
+
+  void decode(bufferlist::iterator& bl) {
+    ::decode(secret_id, bl);
+    ::decode(blob, bl);
+  }
+};
+WRITE_CLASS_ENCODER(CephXTicketBlob);
+
+
 /*
  * TicketHandler
  */
 struct CephXTicketHandler {
   uint32_t service_id;
   CryptoKey session_key;
-  AuthBlob ticket;        // opaque to us
+  CephXTicketBlob ticket;        // opaque to us
   utime_t renew_after, expires;
   bool have_key_flag;