Simplified module interfaces.

[stg.git] / stglibs / srvconf.lib / parsers / get_user.cpp

diff --git a/stglibs/srvconf.lib/parsers/get_user.cpp b/stglibs/srvconf.lib/parsers/get_user.cpp
index 3da8ee98f99a192ee111f5fcc41b7b32a1354eb4..a851e38077ec16b22e25036461e9b08afca6177b 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_user.cpp
+++ b/stglibs/srvconf.lib/parsers/get_user.cpp
@@ -112,6 +112,9 @@ if (depth == 1)
 if (depth == 2 && parsingAnswer)
     ParseUserParams(el, attr);
 
 if (depth == 2 && parsingAnswer)
     ParseUserParams(el, attr);
 

+if (depth == 3 && parsingAnswer)
+    ParseAuthBy(el, attr);
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -139,19 +142,27 @@ if (strcasecmp(el, "user") == 0)
                 error = attr[3];
             else
                 error = "User not found.";
                 error = attr[3];
             else
                 error = "User not found.";

-            return;

             }
         else if (strcasecmp(attr[0], "login") == 0 && attr[1])
             info.login = attr[1];
             }
         else if (strcasecmp(attr[0], "login") == 0 && attr[1])
             info.login = attr[1];

-        parsingAnswer = true;

         }
         }

-    else
-        parsingAnswer = true;
+    parsingAnswer = true;

     }
 }
 //-----------------------------------------------------------------------------
 void GET_USER::PARSER::ParseUserParams(const char * el, const char ** attr)
 {
     }
 }
 //-----------------------------------------------------------------------------
 void GET_USER::PARSER::ParseUserParams(const char * el, const char ** attr)
 {

-if (!TryParse(propertyParsers, ToLower(el), attr))
+if (strcasecmp(el, "AuthorizedBy") != 0 &&
+    !TryParse(propertyParsers, ToLower(el), attr))

     error = "Invalid parameter.";
 }
     error = "Invalid parameter.";
 }

+//-----------------------------------------------------------------------------
+void GET_USER::PARSER::ParseAuthBy(const char * el, const char ** attr)
+{
+if (strcasecmp(el, "Auth") == 0 &&
+    attr && attr[0] && attr[1] &&
+    strcasecmp(attr[0], "name") == 0)
+    info.authBy.push_back(attr[1]);
+else
+    error = "Invalid auth description.";
+}