Fixed installation path for rlm_stg project.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index c63edfe0d16f4af11dbb31e3ebe0e6cd67e45ae6..bfe2f7bca7facab3d28b41f60cc4ca7778978084 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -13,6 +13,7 @@
 #include "stg/tariffs.h"
 #include "stg/user_property.h"
 #include "stg/settings.h"
 #include "stg/tariffs.h"
 #include "stg/user_property.h"
 #include "stg/settings.h"

+#include "stg/logger.h"

 #include "parser.h"
 
 #define  UNAME_LEN      (256)
 #include "parser.h"
 
 #define  UNAME_LEN      (256)


@@ -996,6 +997,7 @@ switch (res)
 //-----------------------------------------------------------------------------
 int PARSER_CHG_USER::AplayChanges()
 {
 //-----------------------------------------------------------------------------
 int PARSER_CHG_USER::AplayChanges()
 {

+printfd(__FILE__, "PARSER_CHG_USER::AplayChanges()\n");

 USER_PTR u;
 
 res = 0;
 USER_PTR u;
 
 res = 0;


@@ -1005,12 +1007,29 @@ if (users->FindByName(login, &u))
     return -1;
     }
 
     return -1;
     }
 

+bool check = false;
+bool alwaysOnline = u->GetProperty().alwaysOnline;
+if (!ucr->alwaysOnline.res_empty())
+    {
+    check = true;
+    alwaysOnline = ucr->alwaysOnline.const_data();
+    }
+bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();

 if (!ucr->ips.res_empty())
 if (!ucr->ips.res_empty())

-    if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store))
-        res = -1;
+    {
+    check = true;
+    onlyOneIP = ucr->ips.const_data().OnlyOneIP();
+    }

 
 

-if (!ucr->address.res_empty())
-    if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store))
+if (check && alwaysOnline && !onlyOneIP)
+    {
+    printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n");
+    GetStgLogger()("%s Requested change leads to a forbidden state: AlwaysOnline with multiple IP's", currAdmin->GetLogStr().c_str());
+    return -1;
+    }
+
+if (!ucr->ips.res_empty())
+    if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store))

         res = -1;
 
 if (!ucr->alwaysOnline.res_empty())
         res = -1;
 
 if (!ucr->alwaysOnline.res_empty())


@@ -1018,6 +1037,10 @@ if (!ucr->alwaysOnline.res_empty())
                                       currAdmin, login, store))
         res = -1;
 
                                       currAdmin, login, store))
         res = -1;
 

+if (!ucr->address.res_empty())
+    if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store))
+        res = -1;
+

 if (!ucr->creditExpire.res_empty())
     if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
                                       currAdmin, login, store))
 if (!ucr->creditExpire.res_empty())
     if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
                                       currAdmin, login, store))