auth: remove (unused) addr field from authenticate, ticket

diff --git a/src/auth/Auth.cc b/src/auth/Auth.cc
index e96ce62b767d68dff7d83896af4838087ce087dc..c6c73f00fde7c0cbfefab77b4fa5f51e5597ef60 100644 (file)
--- a/src/auth/Auth.cc
+++ b/src/auth/Auth.cc
@@ -15,10 +15,10 @@
  *
  * principal_name, principal_addr.  "please authenticate me."
  */
-void build_authenticate_request(EntityName& principal_name, entity_addr_t& principal_addr,
+void build_authenticate_request(EntityName& principal_name,
                                bufferlist& request)
 {
-  AuthAuthenticateRequest req(principal_name, principal_addr);
+  AuthAuthenticateRequest req(principal_name);
   ::encode(req, request);
 }
 

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 0314d52297fd0afd0d656c1bee25589815bb2270..c14a37d8e47b5cb34c123cb4cbfe153adaddbd20 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -49,7 +49,6 @@ static inline ostream& operator<<(ostream& out, const EntityAuth& a) {
  */
 struct AuthTicket {
   EntityName name;
-  entity_addr_t addr;
   utime_t created, renew_after, expires;
   bufferlist caps;
   __u32 flags;
@@ -68,7 +67,6 @@ struct AuthTicket {
     __u8 v = 1;
     ::encode(v, bl);
     ::encode(name, bl);
-    ::encode(addr, bl);
     ::encode(created, bl);
     ::encode(expires, bl);
     ::encode(caps, bl);
@@ -78,7 +76,6 @@ struct AuthTicket {
     __u8 v;
     ::decode(v, bl);
     ::decode(name, bl);
-    ::decode(addr, bl);
     ::decode(created, bl);
     ::decode(expires, bl);
     ::decode(caps, bl);
@@ -115,8 +112,7 @@ struct SessionAuthInfo {
 /*
  * Authentication
  */
-extern void build_authenticate_request(EntityName& principal_name, entity_addr_t& principal_addr,
-                                      bufferlist& request);
+extern void build_authenticate_request(EntityName& principal_name, bufferlist& request);
 
 
 extern bool build_service_ticket(SessionAuthInfo& ticket_info, bufferlist& reply);
@@ -130,19 +126,16 @@ extern bool build_service_ticket_reply(CryptoKey& principal_secret,
 
 struct AuthAuthenticateRequest {
   EntityName name;
-  entity_addr_t addr;
 
   AuthAuthenticateRequest() {}
-  AuthAuthenticateRequest(EntityName& principal_name, entity_addr_t principal_addr) :
-    name(principal_name), addr(principal_addr) {}
+  AuthAuthenticateRequest(EntityName& principal_name) :
+    name(principal_name) {}
 
   void encode(bufferlist& bl) const {
     ::encode(name, bl);
-    ::encode(addr, bl);
   }
   void decode(bufferlist::iterator& bl) {
     ::decode(name, bl);
-    ::decode(addr, bl);
   }
 };
 WRITE_CLASS_ENCODER(AuthAuthenticateRequest)

diff --git a/src/auth/AuthClientHandler.cc b/src/auth/AuthClientHandler.cc
index ae14b87dc4208d2134fa999c4fb2aaa81183ca9d..38fe33d0e46a73fc8d864db6ff13a78b899dedb5 100644 (file)
--- a/src/auth/AuthClientHandler.cc
+++ b/src/auth/AuthClientHandler.cc
@@ -168,7 +168,7 @@ int AuthClientAuthenticateHandler::generate_cephx_authenticate_request(bufferlis
 
     ::encode(header, bl);
 
-    build_authenticate_request(client->name, client->addr, bl);
+    build_authenticate_request(client->name, bl);
     cephx_request_state = 1;
     return 0;
   }

diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h
index d20f72ca082a3a90992238a3c7af7a32a182c2d0..a14ed240c549ad68de52cf298b49bcdfe8a3c6f4 100644 (file)
--- a/src/auth/AuthClientHandler.h
+++ b/src/auth/AuthClientHandler.h
@@ -135,7 +135,6 @@ class AuthClientHandler {
 
 public:
   EntityName name;
-  entity_addr_t addr;
   uint32_t want;
   uint32_t have;
 

diff --git a/src/auth/AuthServiceHandler.cc b/src/auth/AuthServiceHandler.cc
index 6611a78253b411bce9d4adf7e2b40f91a0dd3bdc..7b150112d4b4e4cdf00bc3e45f069e51f8eb4b60 100644 (file)
--- a/src/auth/AuthServiceHandler.cc
+++ b/src/auth/AuthServiceHandler.cc
@@ -145,7 +145,6 @@ int CephAuthService_X::handle_cephx_protocol(bufferlist::iterator& indata, buffe
       }
 
       info.ticket.name = req.name;
-      info.ticket.addr = req.addr;
       info.ticket.init_timestamps(g_clock.now(), g_conf.auth_mon_ticket_ttl);
 
       mon->key_server.generate_secret(session_key);

diff --git a/src/auth/KeyServer.cc b/src/auth/KeyServer.cc
index 00dd4a4ab603bd30fa626892777f06aa3694fa9d..b5e37fccd697438dfa5ccdddd0c94690e617aa73 100644 (file)
--- a/src/auth/KeyServer.cc
+++ b/src/auth/KeyServer.cc
@@ -321,7 +321,6 @@ bool KeyServer::get_rotating_encrypted(EntityName& name, bufferlist& enc_bl)
 int KeyServer::_build_session_auth_info(uint32_t service_id, AuthServiceTicketInfo& auth_ticket_info, SessionAuthInfo& info)
 {
   info.ticket.name = auth_ticket_info.ticket.name;
-  info.ticket.addr = auth_ticket_info.ticket.addr;
   info.ticket.init_timestamps(g_clock.now(), g_conf.auth_service_ticket_ttl);
 
   generate_secret(info.session_key);