Enable building #WITHOUT_PROXY

[freeradius.git] / src / modules / rlm_attr_filter / rlm_attr_filter.c

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index ba5e53c..cb8f61c 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -102,7 +102,7 @@ static int getattrsfile(const char *filename, PAIR_LIST **pair_list)
                     * and we ignore Fall-Through,
                     * then bitch about it, giving a good warning message.
                     */
-                   if (!(vp->attribute & ~0xffff) &&
+                    if ((vp->vendor == 0) &&
                         (vp->attribute > 0xff) &&
                         (vp->attribute > 1000)) {
                        log_debug("[%s]:%d WARNING! Check item \"%s\"\n"
@@ -187,7 +187,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
        if (!inst->key) {
                VALUE_PAIR      *namepair;
 
-               namepair = pairfind(request->packet->vps, PW_REALM);
+               namepair = pairfind(request->packet->vps, PW_REALM, 0);
                if (!namepair) {
                        return (RLM_MODULE_NOOP);
                }
@@ -275,7 +275,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
                                 *      is always true.
                                 */
                                if ((check_item->attribute == PW_VENDOR_SPECIFIC) &&
-                                   (VENDOR(vp->attribute) != 0) &&
+                                   (vp->vendor != 0) &&
                                    (check_item->operator == T_OP_CMP_TRUE)) {
                                        pass++;
                                        continue;
@@ -316,12 +316,12 @@ static int attr_filter_common(void *instance, REQUEST *request,
 
        if (request->packet->code == PW_AUTHENTICATION_REQUEST) {
                request->username = pairfind(request->packet->vps,
-                                            PW_STRIPPED_USER_NAME);
+                                            PW_STRIPPED_USER_NAME, 0);
                if (!request->username) 
                        request->username = pairfind(request->packet->vps,
-                                                    PW_USER_NAME);
+                                                    PW_USER_NAME, 0);
                request->password = pairfind(request->packet->vps,
-                                            PW_USER_PASSWORD);
+                                            PW_USER_PASSWORD, 0);
        }
 
        return RLM_MODULE_UPDATED;
@@ -337,6 +337,7 @@ static int attr_filter_accounting(void *instance, REQUEST *request)
        return attr_filter_common(instance, request, request->reply);
 }
 
+#ifdef WITH_PROXY
 static int attr_filter_preproxy(void *instance, REQUEST *request)
 {
        return attr_filter_common(instance, request, request->proxy);
@@ -346,6 +347,7 @@ static int attr_filter_postproxy(void *instance, REQUEST *request)
 {
        return attr_filter_common(instance, request, request->proxy_reply);
 }
+#endif
 
 static int attr_filter_postauth(void *instance, REQUEST *request)
 {
@@ -371,8 +373,12 @@ module_t rlm_attr_filter = {
                attr_filter_preacct,    /* pre-acct */
                attr_filter_accounting, /* accounting */
                NULL,                   /* checksimul */
+#ifdef WITH_PROXY
                attr_filter_preproxy,   /* pre-proxy */
                attr_filter_postproxy,  /* post-proxy */
+#else
+               NULL, NULL,
+#endif
                attr_filter_postauth    /* post-auth */
        },
 };