Ticket. The stgTime argument added in TariffChangeIsAllowed() function

[stg.git] / projects / stargazer / users_impl.cpp

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 70a079bf8fb20608b9e47c1154566a833b4645ad..9985615f85d06c58c9d3ba766cb668a224964379 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -319,6 +319,7 @@ STG_LOCKER lock(&mutex);
 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
+    printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());
     return false;
     }
 
@@ -362,14 +363,15 @@ for (unsigned int i = 0; i < usersList.size(); i++)
 
         if (ui->ReadStat() < 0)
             return -1;
-        } else
-                {
-                if (ui->ReadConf() < 0)
-                    errors++;
+        }
+    else
+        {
+        if (ui->ReadConf() < 0)
+            errors++;
 
-                if (ui->ReadStat() < 0)
-                    errors++;
-                }
+        if (ui->ReadStat() < 0)
+            errors++;
+        }
     }
 
 if (errors > 0)
@@ -437,15 +439,7 @@ while (us->nonstop)
     stgUsleep(100000);
     } //while (us->nonstop)
 
-user_iter ui = us->users.begin();
-while (ui != us->users.end())
-    {
-    us->DelUserFromIndexes(ui);
-    ++ui;
-    }
-
-std::list<USER_TO_DEL>::iterator iter;
-iter = us->usersToDelete.begin();
+std::list<USER_TO_DEL>::iterator iter(us->usersToDelete.begin());
 while (iter != us->usersToDelete.end())
     {
     iter->delTime -= 2 * userDeleteDelayTime;