From c964aa2708ed2839ded3c35eed7338f3e81f568f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 24 Aug 2009 04:47:54 +0200
Subject: =?UTF-8?q?Authentifikation:=20=C3=9Cbertrage=20Passw=C3=B6rter=20?=
 =?UTF-8?q?gehasht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RequestHandlers/ConnectionRequestHandlerGroup.cpp      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/Server/RequestHandlers')

diff --git a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
index 37e2e79..7607171 100644
--- a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
+++ b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
@@ -43,6 +43,15 @@ void ConnectionRequestHandlerGroup::handleAuthMethodRequest(boost::shared_ptr<co
     Common::XmlPacket::List::iterator entry = list->addEntry();
 
     entry->set("name", *method);
+    Common::XmlPacket::List *subList = entry->createList("subMethods");
+
+    const std::vector<std::string> &subMethods = application->getAuthManager()->getSubMethods(*method);
+
+    for(std::vector<std::string>::const_iterator subMethod = subMethods.begin(); subMethod != subMethods.end(); ++subMethod) {
+      Common::XmlPacket::List::iterator subEntry = subList->addEntry();
+
+      subEntry->set("name", *subMethod);
+    }
   }
 }
 
@@ -50,8 +59,9 @@ void ConnectionRequestHandlerGroup::handleAuthRequest(boost::shared_ptr<const Co
   std::vector<boost::uint8_t> response;
 
   boost::shared_ptr<const Common::AuthContext> authContext = application->getConnectionManager()->authenticateConnection(connection,
-      packet->get<const std::string&>("method"), packet->get<const std::string&>("user"),
-      packet->get<const std::vector<boost::uint8_t>&>("data"), response);
+      packet->get<const std::string&>("method"), packet->get<const std::string&>("subMethod"),
+      packet->get<const std::string&>("user"), packet->get<const std::vector<boost::uint8_t>&>("data"),
+      response);
 
   if(!response.empty())
     ret->set("data", response);
-- 
cgit v1.2.3