From 6e524cc58e0a5ccf03fe317cc589e0898de80fd8 Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Tue, 18 Mar 2003 05:53:47 +0000
Subject: [PATCH] 	More NAS_PORT_ID cleanups

---
 src/modules/rlm_ippool/rlm_ippool.c         | 4 ++--
 src/modules/rlm_preprocess/rlm_preprocess.c | 2 +-
 src/modules/rlm_unix/rlm_unix.c             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/rlm_ippool/rlm_ippool.c b/src/modules/rlm_ippool/rlm_ippool.c
index 90f6321..56c6563 100644
--- 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
--- 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
--- 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;
-- 
2.1.4