Merge remote-tracking branch 'github/master'

[stg.git] / projects / rscriptd / listener.cpp

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index cc2a05603c88666c9d421fbf752a0e95160563f6..3d8fd48e0c8b5da6f4763870de5069967d2d1c70 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -36,6 +36,7 @@
 #include "stg/scriptexecuter.h"
 #include "stg/locker.h"
 #include "stg/common.h"
 #include "stg/scriptexecuter.h"
 #include "stg/locker.h"
 #include "stg/common.h"

+#include "stg/const.h"

 #include "listener.h"
 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
 #include "listener.h"
 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);


@@ -43,7 +44,7 @@ void Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
 
 //-----------------------------------------------------------------------------
 LISTENER::LISTENER()
 
 //-----------------------------------------------------------------------------
 LISTENER::LISTENER()

-    : WriteServLog(GetStgLogger()),
+    : WriteServLog(STG::Logger::get()),

       port(0),
       running(false),
       receiverStopped(true),
       port(0),
       running(false),
       receiverStopped(true),


@@ -396,6 +397,7 @@ while (it != pending.end() && count < 256)
             {
             printfd(__FILE__, "Disconnect user '%s'\n", it->login.c_str());
             // Disconnect existing user
             {
             printfd(__FILE__, "Disconnect user '%s'\n", it->login.c_str());
             // Disconnect existing user

+            uit->params = it->params;

             Disconnect(*uit);
             users.erase(uit);
             }
             Disconnect(*uit);
             users.erase(uit);
             }