Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / rlm_stg / rlm_stg.c

diff --git a/projects/rlm_stg/rlm_stg.c b/projects/rlm_stg/rlm_stg.c
index 4030669533f3a9f784f5143edb109a031a7f33b6..84df4e7b7cbf683d2a44b4e0e129f2431fedf8d9 100644 (file)
--- a/projects/rlm_stg/rlm_stg.c
+++ b/projects/rlm_stg/rlm_stg.c
@@ -57,9 +57,11 @@ static size_t toVPS(const STG_PAIR* pairs, VALUE_PAIR** vps)
 
     while (!emptyPair(pair)) {
         VALUE_PAIR* vp = pairmake(pair->key, pair->value, T_OP_SET);
 
     while (!emptyPair(pair)) {
         VALUE_PAIR* vp = pairmake(pair->key, pair->value, T_OP_SET);

-        pairadd(vps, vp);
+        if (vp != NULL) {
+            pairadd(vps, vp);
+            ++count;
+        }

         ++pair;
         ++pair;

-        ++count;

     }
 
     return count;
     }
 
     return count;


@@ -70,6 +72,7 @@ static size_t toReply(STG_RESULT result, REQUEST* request)
     size_t count = 0;
 
     count += toVPS(result.modify, &request->config_items);
     size_t count = 0;
 
     count += toVPS(result.modify, &request->config_items);

+    pairfree(&request->reply->vps);

     count += toVPS(result.reply, &request->reply->vps);
 
     deletePairs(result.modify);
     count += toVPS(result.reply, &request->reply->vps);
 
     deletePairs(result.modify);


@@ -97,7 +100,7 @@ static STG_PAIR* fromVPS(const VALUE_PAIR* pairs)
         bzero(res[pos].key, sizeof(res[0].key));
         bzero(res[pos].value, sizeof(res[0].value));
         strncpy(res[pos].key, pairs->name, sizeof(res[0].key));
         bzero(res[pos].key, sizeof(res[0].key));
         bzero(res[pos].value, sizeof(res[0].value));
         strncpy(res[pos].key, pairs->name, sizeof(res[0].key));

-        vp_prints_value(res[pos].value, sizeof(res[0].value), pairs, 0);
+        vp_prints_value(res[pos].value, sizeof(res[0].value), (VALUE_PAIR*)pairs, 0);

         ++pos;
         pairs = pairs->next;
     }
         ++pos;
         pairs = pairs->next;
     }


@@ -106,6 +109,23 @@ static STG_PAIR* fromVPS(const VALUE_PAIR* pairs)
     return res;
 }
 
     return res;
 }
 

+static int toRLMCode(int code)
+{
+    switch (code)
+    {
+        case STG_REJECT:   return RLM_MODULE_REJECT;
+        case STG_FAIL:     return RLM_MODULE_FAIL;
+        case STG_OK:       return RLM_MODULE_OK;
+        case STG_HANDLED:  return RLM_MODULE_HANDLED;
+        case STG_INVALID:  return RLM_MODULE_INVALID;
+        case STG_USERLOCK: return RLM_MODULE_USERLOCK;
+        case STG_NOTFOUND: return RLM_MODULE_NOTFOUND;
+        case STG_NOOP:     return RLM_MODULE_NOOP;
+        case STG_UPDATED:  return RLM_MODULE_UPDATED;
+    }
+    return RLM_MODULE_REJECT;
+}
+

 /*
  *    Do any per-module initialization that is separate to each
  *    configured instance of the module.  e.g. set up connections
 /*
  *    Do any per-module initialization that is separate to each
  *    configured instance of the module.  e.g. set up connections


@@ -189,7 +209,7 @@ static int stg_authorize(void* instance, REQUEST* request)
     if (count)
         return RLM_MODULE_UPDATED;
 
     if (count)
         return RLM_MODULE_UPDATED;
 

-    return RLM_MODULE_NOOP;
+    return toRLMCode(result.returnCode);

 }
 
 /*
 }
 
 /*


@@ -230,7 +250,7 @@ static int stg_authenticate(void* instance, REQUEST* request)
     if (count)
         return RLM_MODULE_UPDATED;
 
     if (count)
         return RLM_MODULE_UPDATED;
 

-    return RLM_MODULE_NOOP;
+    return toRLMCode(result.returnCode);

 }
 
 /*
 }
 
 /*


@@ -271,7 +291,7 @@ static int stg_preacct(void* instance, REQUEST* request)
     if (count)
         return RLM_MODULE_UPDATED;
 
     if (count)
         return RLM_MODULE_UPDATED;
 

-    return RLM_MODULE_NOOP;
+    return toRLMCode(result.returnCode);

 }
 
 /*
 }
 
 /*


@@ -312,7 +332,7 @@ static int stg_accounting(void* instance, REQUEST* request)
     if (count)
         return RLM_MODULE_UPDATED;
 
     if (count)
         return RLM_MODULE_UPDATED;
 

-    return RLM_MODULE_OK;
+    return toRLMCode(result.returnCode);

 }
 
 /*
 }
 
 /*


@@ -371,7 +391,7 @@ static int stg_postauth(void* instance, REQUEST* request)
     if (count)
         return RLM_MODULE_UPDATED;
 
     if (count)
         return RLM_MODULE_UPDATED;
 

-    return RLM_MODULE_NOOP;
+    return toRLMCode(result.returnCode);

 }
 
 static int stg_detach(void* instance)
 }
 
 static int stg_detach(void* instance)


@@ -384,7 +404,7 @@ static int stg_detach(void* instance)
 module_t rlm_stg = {
     RLM_MODULE_INIT,
     "stg",
 module_t rlm_stg = {
     RLM_MODULE_INIT,
     "stg",

-    RLM_TYPE_THREAD_SAFE, /* type */
+    RLM_TYPE_THREAD_UNSAFE, /* type */

     stg_instantiate,      /* instantiation */
     stg_detach,           /* detach */
     {
     stg_instantiate,      /* instantiation */
     stg_detach,           /* detach */
     {