Added integer translations for Service-Type to radius.h

Added missing include in raduse, fixed PW_STRIPED_USERNAME in rlm_preprocess

diff --git a/src/include/radius.h b/src/include/radius.h
index d80e624..0be6f34 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -101,9 +101,14 @@
 
 #define        PW_LOGIN_USER                   1
 #define        PW_FRAMED_USER                  2
-#define        PW_DIALBACK_LOGIN_USER          3
-#define        PW_DIALBACK_FRAMED_USER         4
-
+#define        PW_CALLBACK_LOGIN_USER          3
+#define        PW_CALLBACK_FRAMED_USER         4
+#define PW_OUTBOUND_USER               5
+#define PW_ADMINISTRATIVE_USER         6
+#define PW_NAS_PROMPT_USER             7
+#define PW_AUTHENTICATE_ONLY           8
+#define PW_CALLBACK_NAS_PROMPT         9
+             
 /*     Framed Protocols        */
 
 #define        PW_PPP                          1

diff --git a/src/main/raduse.c b/src/main/raduse.c
index 0dcc3c0..bfd8fbb 100644 (file)
--- a/src/main/raduse.c
+++ b/src/main/raduse.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include "sysutmp.h"
 #include "conf.h"
+#include "radpaths.h"
 
 #ifdef __svr4__
 #  define ut_time ut_xtime

diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c
index 01aa308..6fdb241 100644 (file)
--- a/src/modules/rlm_preprocess/rlm_preprocess.c
+++ b/src/modules/rlm_preprocess/rlm_preprocess.c
@@ -212,10 +212,10 @@ static int hints_setup(VALUE_PAIR *request_pairs)
         *      See if we need to adjust the name.
         */
        do_strip = 1;
-       if ((tmp = pairfind(i->reply, PW_STRIP_USERNAME)) != NULL
+       if ((tmp = pairfind(i->reply, PW_STRIP_USER_NAME)) != NULL
             && tmp->lvalue == 0)
                do_strip = 0;
-       if ((tmp = pairfind(i->check, PW_STRIP_USERNAME)) != NULL
+       if ((tmp = pairfind(i->check, PW_STRIP_USER_NAME)) != NULL
             && tmp->lvalue == 0)
                do_strip = 0;
 
@@ -231,7 +231,7 @@ static int hints_setup(VALUE_PAIR *request_pairs)
         *      Now add all attributes to the request list,
         *      except the PW_STRIP_USERNAME one.
         */
-       pairdelete(&add, PW_STRIP_USERNAME);
+       pairdelete(&add, PW_STRIP_USER_NAME);
        for(last = request_pairs; last && last->next; last = last->next)
                ;
        if (last) last->next = add;