From: Joao Eduardo Luis <joao@redhat.com>
Date: Fri, 14 Nov 2014 21:03:54 +0000 (+0000)
Subject: mon: Monitor: stash auth entity name in session
X-Git-Tag: v0.80.10~47^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=370f37f452aff3b48f9ae8a33b7ef26b572b41c8;p=ceph.git

mon: Monitor: stash auth entity name in session

Backport: giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit ca8e1efc0be9bffcfbdce5593526d257aa498062)
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index ad35e5ed39c..ee4bd039b10 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2869,7 +2869,6 @@ bool Monitor::_ms_dispatch(Message *m)
   ConnectionRef connection = m->get_connection();
   MonSession *s = NULL;
   MonCap caps;
-  EntityName entity_name;
   bool src_is_mon;
 
   // regardless of who we are or who the sender is, the message must
@@ -2937,7 +2936,7 @@ bool Monitor::_ms_dispatch(Message *m)
 
   if (s) {
     if (s->auth_handler) {
-      entity_name = s->auth_handler->get_entity_name();
+      s->entity_name = s->auth_handler->get_entity_name();
     }
     dout(20) << " caps " << s->caps.get_str() << dendl;
   }
diff --git a/src/mon/Session.h b/src/mon/Session.h
index a5f67d9e2da..6aedac9e982 100644
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -53,6 +53,7 @@ struct MonSession : public RefCountedObject {
   map<string, Subscription*> sub_map;
 
   AuthServiceHandler *auth_handler;
+  EntityName entity_name;
 
   ConnectionRef proxy_con;
   uint64_t proxy_tid;