Ticket 37. In the TariffChangeIsAllowed() function return "" added and

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

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index 9fe4c0f0c37cce0730be4f730c7630028a63ddd4..0b626afd1f936be27b20a200f9409797c6cb1c9b 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -311,7 +311,7 @@ else if (packetHead.packetType == RS_DISCONNECT_PACKET)
         }
     }
 
         }
     }
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 pending.push_back(data);
 
 return false;
 pending.push_back(data);
 
 return false;


@@ -396,6 +396,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);
             }


@@ -411,7 +412,7 @@ while (it != pending.end() && count < 256)
     ++it;
     ++count;
     }
     ++it;
     ++count;
     }

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 pending.erase(pending.begin(), it);
 }
 //-----------------------------------------------------------------------------
 pending.erase(pending.begin(), it);
 }
 //-----------------------------------------------------------------------------