Support all next FreeBSD versions by default.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
index 9d87f30047bc434e8d6688451cb713fd2ef990b4..b1285a772441d3facc49cd96937c05f11ba9c24d 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
@@ -213,11 +213,11 @@ void PARSER_CHG_ADMIN::CreateAnswer()
 answerList->erase(answerList->begin(), answerList->end());
 
 
 answerList->erase(answerList->begin(), answerList->end());
 
 

-if (!login.res_empty())
+if (!login.empty())

     {
     ADMIN * origAdmin = NULL;
 
     {
     ADMIN * origAdmin = NULL;
 

-    if (admins->Find(login, &origAdmin))
+    if (admins->Find(login.data(), &origAdmin))

         {
         answerList->push_back(std::string("<ChgAdmin Result = \"Admin '") + login.data() + "' is not found.\"/>");
         return;
         {
         answerList->push_back(std::string("<ChgAdmin Result = \"Admin '") + login.data() + "' is not found.\"/>");
         return;


@@ -225,10 +225,10 @@ if (!login.res_empty())
 
     ADMIN_CONF conf(origAdmin->GetConf());
 
 
     ADMIN_CONF conf(origAdmin->GetConf());
 

-    if (!password.res_empty())
+    if (!password.empty())

         conf.password = password.data();
 
         conf.password = password.data();
 

-    if (!privAsString.res_empty())
+    if (!privAsString.empty())

         {
         int p = 0;
         if (str2x(privAsString.data().c_str(), p) < 0)
         {
         int p = 0;
         if (str2x(privAsString.data().c_str(), p) < 0)