[PATCH] Acct-Authentic should not be sent in Accounting-On and Accounting-Off

[Nick Lowe <nick.lowe@xxxxxxxxxxxx>]

Version without broken whitespace attached.

Acct-Authentic should not be sent in Accounting-On and
 Accounting-Off

Signed-off-by: Nick Lowe <nick.lowe@xxxxxxxxxxxx>
---
 src/ap/accounting.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index babfe2d..7636cfc 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -76,17 +76,17 @@ static struct radius_msg * accounting_msg(struct
hostapd_data *hapd,
         goto fail;
     }

-    if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                        RADIUS_ATTR_ACCT_AUTHENTIC) &&
-        !radius_msg_add_attr_int32(msg, RADIUS_ATTR_ACCT_AUTHENTIC,
-                       hapd->conf->ieee802_1x ?
-                       RADIUS_ACCT_AUTHENTIC_RADIUS :
-                       RADIUS_ACCT_AUTHENTIC_LOCAL)) {
-        wpa_printf(MSG_INFO, "Could not add Acct-Authentic");
-        goto fail;
-    }
-
     if (sta) {
+        if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
+                            RADIUS_ATTR_ACCT_AUTHENTIC) &&
+            !radius_msg_add_attr_int32(msg, RADIUS_ATTR_ACCT_AUTHENTIC,
+                           hapd->conf->ieee802_1x ?
+                           RADIUS_ACCT_AUTHENTIC_RADIUS :
+                           RADIUS_ACCT_AUTHENTIC_LOCAL)) {
+            wpa_printf(MSG_INFO, "Could not add Acct-Authentic");
+            goto fail;
+        }
+
         /* Use 802.1X identity if available */
         val = ieee802_1x_get_identity(sta->eapol_sm, &len);

-- 
2.5.0

From f804eb2b64079ebf5b0d9eadcb3263f53230f007 Mon Sep 17 00:00:00 2001
From: Nick Lowe <nick.lowe@xxxxxxxxxxxx>
Date: Mon, 25 Jan 2016 10:53:28 +0000
Subject: [PATCH 6/6] Acct-Authentic should not be sent in Accounting-On and
 Accounting-Off

Signed-off-by: Nick Lowe <nick.lowe@xxxxxxxxxxxx>
---
 src/ap/accounting.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index babfe2d..7636cfc 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -76,17 +76,17 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
 		goto fail;
 	}
 
-	if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-					    RADIUS_ATTR_ACCT_AUTHENTIC) &&
-	    !radius_msg_add_attr_int32(msg, RADIUS_ATTR_ACCT_AUTHENTIC,
-				       hapd->conf->ieee802_1x ?
-				       RADIUS_ACCT_AUTHENTIC_RADIUS :
-				       RADIUS_ACCT_AUTHENTIC_LOCAL)) {
-		wpa_printf(MSG_INFO, "Could not add Acct-Authentic");
-		goto fail;
-	}
-
 	if (sta) {
+		if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
+							RADIUS_ATTR_ACCT_AUTHENTIC) &&
+			!radius_msg_add_attr_int32(msg, RADIUS_ATTR_ACCT_AUTHENTIC,
+						   hapd->conf->ieee802_1x ?
+						   RADIUS_ACCT_AUTHENTIC_RADIUS :
+						   RADIUS_ACCT_AUTHENTIC_LOCAL)) {
+			wpa_printf(MSG_INFO, "Could not add Acct-Authentic");
+			goto fail;
+		}
+
 		/* Use 802.1X identity if available */
 		val = ieee802_1x_get_identity(sta->eapol_sm, &len);
 
-- 
2.5.0

_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap