Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / other / radius / radius.cpp

diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp
index c1ecab16164494c70aaf9cb46a3f9c6a7d2ec2fd..937d853ca374ab819aa0340db214a96e7390eeda 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -30,11 +30,11 @@
 #include <cerrno>
 #include <algorithm>
 
 #include <cerrno>
 #include <algorithm>
 

+#include "stg/store.h"
+#include "stg/common.h"
+#include "stg/user_conf.h"
+#include "stg/user_property.h"

 #include "radius.h"
 #include "radius.h"

-#include "store.h"
-#include "common.h"
-#include "user_conf.h"
-#include "../../../user_property.h"

 
 extern volatile const time_t stgTime;
 
 
 extern volatile const time_t stgTime;
 


@@ -534,7 +534,7 @@ if (CanAcctService((char *)packet->service))
         return -1;
         }
     USER_IPS ips = ui->GetProperty().ips;
         return -1;
         }
     USER_IPS ips = ui->GetProperty().ips;

-    if (ui->Authorize(ips[0].ip, "", 0xffFFffFF, this))
+    if (ui->Authorize(ips[0].ip, 0xffFFffFF, this))

         {
         printfd(__FILE__, "RADIUS::ProcessAcctStartPacket cannot authorize user '%s'\n", packet->login);
         packet->packetType = RAD_REJECT_PACKET;
         {
         printfd(__FILE__, "RADIUS::ProcessAcctStartPacket cannot authorize user '%s'\n", packet->login);
         packet->packetType = RAD_REJECT_PACKET;