More NAS_PORT_ID cleanups

diff --git a/src/modules/rlm_ippool/rlm_ippool.c b/src/modules/rlm_ippool/rlm_ippool.c
index 90f6321..56c6563 100644 (file)
--- a/src/modules/rlm_ippool/rlm_ippool.c
+++ b/src/modules/rlm_ippool/rlm_ippool.c
@@ -290,7 +290,7 @@ static int ippool_accounting(void *instance, REQUEST *request)
        }
        switch(acctstatustype){
                case PW_STATUS_STOP:
-                       if ((vp = pairfind(request->packet->vps, PW_NAS_PORT_ID)) != NULL)
+                       if ((vp = pairfind(request->packet->vps, PW_NAS_PORT)) != NULL)
                                port = vp->lvalue;
                        else {
                                DEBUG("rlm_ippool: Could not find port number in packet.");
@@ -436,7 +436,7 @@ static int ippool_postauth(void *instance, REQUEST *request)
         * Find the port
         * If not fail
         */
-       if ((vp = pairfind(request->packet->vps, PW_NAS_PORT_ID)) != NULL)
+       if ((vp = pairfind(request->packet->vps, PW_NAS_PORT)) != NULL)
                port = vp->lvalue;
        else{
                DEBUG("rlm_ippool: Could not find port information.");

diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c
index 99951ed..e37b311 100644 (file)
--- a/src/modules/rlm_preprocess/rlm_preprocess.c
+++ b/src/modules/rlm_preprocess/rlm_preprocess.c
@@ -681,7 +681,7 @@ static int preprocess_authorize(void *instance, REQUEST *request)
                 *      approaching rationality.
                 */
                ascend_nasport_hack(pairfind(request->packet->vps,
-                                            PW_NAS_PORT_ID),
+                                            PW_NAS_PORT),
                                    data->ascend_channels_per_line);
        }
 

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index f31fea1..8d311a9 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -718,7 +718,7 @@ static int unix_accounting(void *instance, REQUEST *request)
                        case PW_NAS_IP_ADDRESS:
                                nas_address = vp->lvalue;
                                break;
-                       case PW_NAS_PORT_ID:
+                       case PW_NAS_PORT:
                                nas_port = vp->lvalue;
                                port_seen = 1;
                                break;
@@ -733,7 +733,7 @@ static int unix_accounting(void *instance, REQUEST *request)
 
        /*
         *      We don't store !root sessions, or sessions
-        *      where we didn't see a PW_NAS_PORT_ID.
+        *      where we didn't see a NAS-Port attribute.
         */
        if (strncmp(ut.ut_name, "!root", sizeof(ut.ut_name)) == 0 || !port_seen)
                return RLM_MODULE_NOOP;