msgr: use authorizer, init to 0

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 3d54981e15e3a3c5f77f5c5b6adff4e3b577a6cc..82a1b1bc3f5f7b96a3281800ebf42b3816158466 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -125,7 +125,7 @@ protected:
   }
 
   AuthAuthorizer *ms_deliver_get_authorizer(int peer_type, bool force_new) {
-    AuthAuthorizer *a;
+    AuthAuthorizer *a = 0;
     for (list<Dispatcher*>::iterator p = dispatchers.begin();
         p != dispatchers.end();
         p++)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index f9629d345d898825f21034e4bf438a95eba305f0..9e3ad6cc91fa3d8d42d2094deba1d765e9b379ba 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -964,7 +964,7 @@ int SimpleMessenger::Pipe::connect()
   }
   dout(10) << "connect sent my addr " << rank->rank_addr << dendl;
 
-  rank->get_authorizer(peer_type, false);
+  authorizer = rank->get_authorizer(peer_type, false);
 
   while (1) {
     ceph_msg_connect connect;
@@ -975,7 +975,8 @@ int SimpleMessenger::Pipe::connect()
     connect.authorizer_protocol = authorizer ? authorizer->protocol : 0;
     connect.authorizer_len = authorizer ? authorizer->bl.length() : 0;
     if (authorizer) 
-      dout(10) << "connect.authorizer_len=" << connect.authorizer_len << dendl;
+      dout(10) << "connect.authorizer_len=" << connect.authorizer_len
+              << " protocol=" << connect.authorizer_protocol << dendl;
     connect.flags = 0;
     if (policy.lossy)
       connect.flags |= CEPH_MSG_CONNECT_LOSSY;  // this is fyi, actually, server decides!