X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8f1d13e63e83c5f590d59f6d09f2d1dae69ba526..c3b507d1eb8a82f9eda3a5e7f7b2dd2f2e9bb4c0:/stglibs/srvconf.lib/parser_auth_by.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/parser_auth_by.cpp b/stglibs/srvconf.lib/parser_auth_by.cpp
index 63c23a09..06981aae 100644
--- a/stglibs/srvconf.lib/parser_auth_by.cpp
+++ b/stglibs/srvconf.lib/parser_auth_by.cpp
@@ -1,11 +1,34 @@
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ */
+
 #include "stg/parser_auth_by.h"
 
+#include <cstddef>
+
 #include <strings.h> // strcasecmp
 
 PARSER_AUTH_BY::PARSER_AUTH_BY()
     : callback(NULL),
       data(NULL),
-      depth(0)
+      depth(0),
+      parsingAnswer(false)
 {
 }
 //-----------------------------------------------------------------------------
@@ -14,14 +37,25 @@ int PARSER_AUTH_BY::ParseStart(const char *el, const char **attr)
 depth++;
 if (depth == 1)
     {
-    if (strcasecmp(el, "AuthorizedBy") != 0)
-        info.clear();
+    if (strcasecmp(el, "AuthorizedBy") == 0)
+        if (attr && attr[0] && attr[1])
+            {
+            if (strcasecmp(attr[1], "error") == 0)
+                {
+                if (attr[2] && attr[3])
+                    error = attr[3];
+                else
+                    error = "User not found.";
+                }
+            else
+                parsingAnswer = true;
+            }
     }
 else
     {
     if (depth == 2)
         {
-        if (strcasecmp(el, "Auth") == 0)
+        if (parsingAnswer && strcasecmp(el, "Auth") == 0)
             {
             if (attr && attr[0] && attr[1] && strcasecmp(attr[0], "name") == 0)
                 info.push_back(attr[1]);
@@ -36,11 +70,16 @@ void PARSER_AUTH_BY::ParseEnd(const char * /*el*/)
 {
 depth--;
 if (depth == 0)
-    callback(info, data);
+    {
+    if (callback)
+        callback(error.empty(), error, info, data);
+    info.clear();
+    error.clear();
+    }
 }
 //-----------------------------------------------------------------------------
-void PARSER_AUTH_BY::SetCallback(CALLBACK f, void * data)
+void PARSER_AUTH_BY::SetCallback(CALLBACK f, void * d)
 {
 callback = f;
-data = data;
+data = d;
 }