Removed the Add-Port-To-IP-Address attribute. It's handled

	another way now.

	Correct bug which prevented it from adding the port.
	Bug found by "John Padula" <john_padula@aviancommunications.com>

diff --git a/raddb/dictionary b/raddb/dictionary
index 8f4c420..270c317 100644 (file)
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -138,7 +138,6 @@ ATTRIBUTE   Framed-Pool             88      string
 
 #      These attributes CAN go in the reply item list.
 ATTRIBUTE      Fall-Through            500     integer
-ATTRIBUTE      Add-Port-To-IP-Address  501     integer
 ATTRIBUTE      Exec-Program            502     string
 ATTRIBUTE      Exec-Program-Wait       503     string
 
@@ -332,8 +331,6 @@ VALUE               Auth-Type               Accept                  254
 #
 VALUE          Fall-Through            No                      0
 VALUE          Fall-Through            Yes                     1
-VALUE          Add-Port-To-IP-Address  No                      0
-VALUE          Add-Port-To-IP-Address  Yes                     1
 
 VALUE          Packet-Type     Access-Request                  1
 VALUE          Packet-Type     Access-Accept                   2

diff --git a/share/dictionary b/share/dictionary
index 8f4c420..270c317 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -138,7 +138,6 @@ ATTRIBUTE   Framed-Pool             88      string
 
 #      These attributes CAN go in the reply item list.
 ATTRIBUTE      Fall-Through            500     integer
-ATTRIBUTE      Add-Port-To-IP-Address  501     integer
 ATTRIBUTE      Exec-Program            502     string
 ATTRIBUTE      Exec-Program-Wait       503     string
 
@@ -332,8 +331,6 @@ VALUE               Auth-Type               Accept                  254
 #
 VALUE          Fall-Through            No                      0
 VALUE          Fall-Through            Yes                     1
-VALUE          Add-Port-To-IP-Address  No                      0
-VALUE          Add-Port-To-IP-Address  Yes                     1
 
 VALUE          Packet-Type     Access-Request                  1
 VALUE          Packet-Type     Access-Accept                   2

diff --git a/src/main/auth.c b/src/main/auth.c
index 4030487..69646b8 100644 (file)
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -221,7 +221,7 @@ int rad_check_password(REQUEST *request)
                auth_type = auth_type_pair->lvalue;
                auth_type_count++;
 
-               DEBUG2("  rad_check_password:  Found auth-type %s",
+               DEBUG2("  rad_check_password:  Found Auth-Type %s",
                                auth_type_pair->strvalue);
                cur_config_item = auth_type_pair->next;
 
@@ -231,7 +231,7 @@ int rad_check_password(REQUEST *request)
                }
        }
 
-       if((auth_type_count>1) && (debug_flag)) {
+       if (( auth_type_count > 1) && (debug_flag)) {
                radlog(L_ERR, "Warning:  Found %d auth-types on request for user '%s'", 
                        auth_type_count, request->username->strvalue);
        }
@@ -394,7 +394,6 @@ int rad_authenticate(REQUEST *request)
        char            *exec_program;
        int             exec_wait;
        int             seen_callback_id;
-       int             nas_port = 0;
        char            buf[1024], logstr[1024];
 
        password = "";
@@ -673,32 +672,20 @@ int rad_authenticate(REQUEST *request)
 
        /*
         *      Add the port number to the Framed-IP-Address if
-        *      vp->addport is set, or if the Add-Port-To-IP-Address
-        *      pair is present.
-        *
-        *      FIXME:  This doesn't work because PW_ADD_PORT_TO_IP_ADDRESS
-        *      is never added to the request pairs!
+        *      vp->addport is set.
         */
-       if ((tmp = pairfind(request->reply->vps, 
-                       PW_FRAMED_IP_ADDRESS)) != NULL) {
+       if (((tmp = pairfind(request->reply->vps, 
+                           PW_FRAMED_IP_ADDRESS)) != NULL) &&
+           (tmp->addport != 0)) {
                VALUE_PAIR *vpPortId;
-               VALUE_PAIR *vpAddPort;
-
+               
                /*
                 *  Find the NAS port ID.
                 */
                if ((vpPortId = pairfind(request->packet->vps,
-                               PW_NAS_PORT_ID)) != NULL)
-                       nas_port = vpPortId->lvalue;
-
-               if((vpAddPort = pairfind(request->reply->vps,
-                               PW_ADD_PORT_TO_IP_ADDRESS)) != NULL) {
-                       if (tmp->addport || (vpAddPort && vpAddPort->lvalue)) {
-                               tmp->lvalue = htonl(ntohl(tmp->lvalue) + nas_port);
-                               tmp->addport = 0;
-                       }
-                       pairdelete(&request->reply->vps,
-                                       PW_ADD_PORT_TO_IP_ADDRESS);
+                                        PW_NAS_PORT_ID)) != NULL) {
+                 tmp->lvalue = htonl(ntohl(tmp->lvalue) + vpPortId->lvalue);
+                 tmp->addport = 0;
                }
        }