Fix CONFIG_DRIVER_RADIUS_ACL=y build

[wpasupplicant] / hostapd / ieee802_11_auth.c

diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c
index 9aba1fe..5de4e2e 100644 (file)
--- a/hostapd/ieee802_11_auth.c
+++ b/hostapd/ieee802_11_auth.c
@@ -27,7 +27,9 @@
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "eloop.h"
-#include "driver.h"
+#ifdef CONFIG_DRIVER_RADIUS_ACL
+#include "driver_i.h"
+#endif /* CONFIG_DRIVER_RADIUS_ACL */
 
 #define RADIUS_ACL_TIMEOUT 30
 
@@ -53,6 +55,7 @@ struct hostapd_acl_query_data {
 };
 
 
+#ifndef CONFIG_NO_RADIUS
 static void hostapd_acl_cache_free(struct hostapd_cached_radius_acl *acl_cache)
 {
        struct hostapd_cached_radius_acl *prev;
@@ -96,6 +99,7 @@ static int hostapd_acl_cache_get(struct hostapd_data *hapd, const u8 *addr,
 
        return -1;
 }
+#endif /* CONFIG_NO_RADIUS */
 
 
 static void hostapd_acl_query_free(struct hostapd_acl_query_data *query)
@@ -107,6 +111,7 @@ static void hostapd_acl_query_free(struct hostapd_acl_query_data *query)
 }
 
 
+#ifndef CONFIG_NO_RADIUS
 static int hostapd_radius_acl_query(struct hostapd_data *hapd, const u8 *addr,
                                    struct hostapd_acl_query_data *query)
 {
@@ -196,6 +201,7 @@ static int hostapd_radius_acl_query(struct hostapd_data *hapd, const u8 *addr,
        os_free(msg);
        return -1;
 }
+#endif /* CONFIG_NO_RADIUS */
 
 
 /**
@@ -234,6 +240,9 @@ int hostapd_allowed_address(struct hostapd_data *hapd, const u8 *addr,
                return HOSTAPD_ACL_REJECT;
 
        if (hapd->conf->macaddr_acl == USE_EXTERNAL_RADIUS_AUTH) {
+#ifdef CONFIG_NO_RADIUS
+               return HOSTAPD_ACL_REJECT;
+#else /* CONFIG_NO_RADIUS */
                struct hostapd_acl_query_data *query;
 
                /* Check whether ACL cache has an entry for this station */
@@ -289,12 +298,14 @@ int hostapd_allowed_address(struct hostapd_data *hapd, const u8 *addr,
                /* Queued data will be processed in hostapd_acl_recv_radius()
                 * when RADIUS server replies to the sent Access-Request. */
                return HOSTAPD_ACL_PENDING;
+#endif /* CONFIG_NO_RADIUS */
        }
 
        return HOSTAPD_ACL_REJECT;
 }
 
 
+#ifndef CONFIG_NO_RADIUS
 static void hostapd_acl_expire_cache(struct hostapd_data *hapd, time_t now)
 {
        struct hostapd_cached_radius_acl *prev, *entry, *tmp;
@@ -453,11 +464,13 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
        hostapd_set_radius_acl_auth(hapd, query->addr, cache->accepted,
                                    cache->session_timeout);
 #else /* CONFIG_DRIVER_RADIUS_ACL */
+#ifdef NEED_MLME
        /* Re-send original authentication frame for 802.11 processing */
        wpa_printf(MSG_DEBUG, "Re-sending authentication frame after "
                   "successful RADIUS ACL query");
        ieee802_11_mgmt(hapd, query->auth_msg, query->auth_msg_len,
                        WLAN_FC_STYPE_AUTH, NULL);
+#endif /* NEED_MLME */
 #endif /* CONFIG_DRIVER_RADIUS_ACL */
 
  done:
@@ -470,6 +483,7 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
 
        return RADIUS_RX_PROCESSED;
 }
+#endif /* CONFIG_NO_RADIUS */
 
 
 /**
@@ -479,11 +493,13 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
  */
 int hostapd_acl_init(struct hostapd_data *hapd)
 {
+#ifndef CONFIG_NO_RADIUS
        if (radius_client_register(hapd->radius, RADIUS_AUTH,
                                   hostapd_acl_recv_radius, hapd))
                return -1;
 
        eloop_register_timeout(10, 0, hostapd_acl_expire, hapd, NULL);
+#endif /* CONFIG_NO_RADIUS */
 
        return 0;
 }
@@ -497,9 +513,11 @@ void hostapd_acl_deinit(struct hostapd_data *hapd)
 {
        struct hostapd_acl_query_data *query, *prev;
 
+#ifndef CONFIG_NO_RADIUS
        eloop_cancel_timeout(hostapd_acl_expire, hapd, NULL);
 
        hostapd_acl_cache_free(hapd->acl_cache);
+#endif /* CONFIG_NO_RADIUS */
 
        query = hapd->acl_queries;
        while (query) {