From 8b680a3a74127f546c49835edde6e04a0ad30b08 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 4 Sep 2009 11:37:21 -0700
Subject: [PATCH] auth: some more compilation fixes

---
 src/auth/Auth.h                |  4 +++-
 src/auth/AuthServiceManager.cc |  1 +
 src/mon/MonClient.cc           | 20 --------------------
 src/mon/MonClient.h            |  4 +---
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 31f34477d2504..9b01531c66120 100644
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -131,9 +131,11 @@ struct ServiceTicket {
 };
 WRITE_CLASS_ENCODER(ServiceTicket)
 
-extern bool verify_get_session_key_request(CryptoKey& service_secret,
+extern bool verify_get_session_keys_request(CryptoKey& service_secret,
                                      CryptoKey& session_key, uint32_t& keys, bufferlist::iterator& indata);
 
+extern bool build_ticket_reply(ServiceTicket service_ticket, CryptoKey auth_session_key, CryptoKey& service_secret,
+			bufferlist& reply);
 /*
  * Verify authenticator and generate reply authenticator
  */
diff --git a/src/auth/AuthServiceManager.cc b/src/auth/AuthServiceManager.cc
index c9038e35f8133..3a7ea9cdcb70f 100644
--- a/src/auth/AuthServiceManager.cc
+++ b/src/auth/AuthServiceManager.cc
@@ -204,6 +204,7 @@ int CephAuthService_X::handle_cephx_protocol(bufferlist::iterator& indata, buffe
 
       auth_server.get_osd_secret(osd_secret);
       build_cephx_response_header(request_type, ret, result_bl);
+
       build_ticket_reply(service_ticket, session_key, osd_secret, result_bl);
     }
     break;
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index a42c652a90215..4a4136f816326 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -209,11 +209,6 @@ int MonClient::mount(double mount_timeout)
   return ret;
 }
 
-int MonClient::unmount(double timeout)
-{
-  return unmount_handler.do_op(timeout);
-}
-
 int MonClient::authorize(uint32_t want_keys, double mount_timeout)
 {
   Mutex::Locker l(auth_lock);
@@ -342,21 +337,6 @@ void MonClient::MonClientMountHandler::handle_response(Message *response)
   cond.Signal();
 }
 
-Message *MonClient::MonClientUnmountHandler::build_request()
-{
-  return new MClientUnmount;
-}
-
-// -------------------
-// UNMOUNT
-void MonClient::MonClientUnmountHandler::handle_response(Message *response)
-{
-  Mutex::Locker lock(op_lock);
-  client->mounted = false;
-  got_ack = true;
-  cond.Signal();
-}
-
 // -------------------
 // AUTH
 Message *MonClient::MonClientAuthHandler::build_request()
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 333175a1d511c..ad5f8adc3b7b9 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -147,7 +147,6 @@ private:
   };
 
   MonClientMountHandler mount_handler;
-  MonClientUnmountHandler unmount_handler;
 
   MonClientAuthHandler *cur_auth_handler;
 
@@ -188,8 +187,7 @@ public:
 		mount_timeout_event(NULL),
 		monc_lock("MonClient::monc_lock"),
 		auth_lock("MonClient::auth_lock"),
-                mount_handler(this),
-                unmount_handler(this) {
+                mount_handler(this) {
     //            auth_handler(this) {
     mounted = false;
     mounters = 0;
-- 
2.39.5