1 files changed, 7 insertions, 15 deletions

diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp
index 3743e43..0a60ff4 100644
--- a/src/Server/ConnectionManager.cpp
+++ b/src/Server/ConnectionManager.cpp
@@ -29,13 +29,9 @@
 #include "RequestHandlers/DaemonListRequestHandler.h"
 #include "RequestHandlers/DaemonStatusRequestHandler.h"
 //#include "RequestHandlers/GSSAPIAuthRequestHandler.h"
-#include "RequestHandlers/GroupListRequestHandler.h"
-#include "RequestHandlers/GroupUserListRequestHandler.h"
 #include "RequestHandlers/IdentifyRequestHandler.h"
 #include "RequestHandlers/LogRequestHandler.h"
-#include "RequestHandlers/UserGroupListRequestHandler.h"
-#include "RequestHandlers/UserInfoRequestHandler.h"
-#include "RequestHandlers/UserListRequestHandler.h"
+#include "RequestHandlers/UserRequestHandlerGroup.h"
 #include <Net/Packet.h>
 #include <Net/Listener.h>
 
@@ -189,6 +185,8 @@ void ConnectionManager::handleDisconnect(boost::shared_ptr<ServerConnection> con
 void ConnectionManager::doInit() {
   Common::RequestManager::get()->setServer(true);
 
+  userRequestHandlerGroup.reset(new RequestHandlers::UserRequestHandlerGroup);
+
   //Common::RequestManager::get()->registerPacketType<RequestHandlers::GSSAPIAuthRequestHandler>("AuthGSSAPI");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonCommandRequestHandler>("DaemonCommand");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonFSInfoRequestHandler>("DaemonFSInfo");
@@ -197,17 +195,16 @@ void ConnectionManager::doInit() {
   Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonStatusRequestHandler>("GetDaemonStatus");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::IdentifyRequestHandler>("Identify");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonListRequestHandler>("ListHosts");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::UserInfoRequestHandler>("GetUserInfo");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::UserListRequestHandler>("ListUsers");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::UserGroupListRequestHandler>("ListUserGroups");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::GroupListRequestHandler>("ListGroups");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::GroupUserListRequestHandler>("ListGroupUsers");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::LogRequestHandler>("Log");
+
+  Common::RequestManager::get()->registerRequestHandlerGroup(userRequestHandlerGroup);
 }
 
 void ConnectionManager::doDeinit() {
   connections.clear();
 
+  Common::RequestManager::get()->unregisterRequestHandlerGroup(userRequestHandlerGroup);
+
   //Common::RequestManager::get()->unregisterPacketType("AuthGSSAPI");
   Common::RequestManager::get()->unregisterPacketType("DaemonCommand");
   Common::RequestManager::get()->unregisterPacketType("DaemonFSInfo");
@@ -216,11 +213,6 @@ void ConnectionManager::doDeinit() {
   Common::RequestManager::get()->unregisterPacketType("GetDaemonStatus");
   Common::RequestManager::get()->unregisterPacketType("Identify");
   Common::RequestManager::get()->unregisterPacketType("ListHosts");
-  Common::RequestManager::get()->unregisterPacketType("GetUserInfo");
-  Common::RequestManager::get()->unregisterPacketType("ListUsers");
-  Common::RequestManager::get()->unregisterPacketType("ListUserGroups");
-  Common::RequestManager::get()->unregisterPacketType("ListGroups");
-  Common::RequestManager::get()->unregisterPacketType("ListGroupUsers");
   Common::RequestManager::get()->unregisterPacketType("Log");
 }