renamed Request-Src-IP-Address to Client-IP-Address, to make it

	match Cistron.

	The Client-IP-Address name is similar to the old Client-ID, etc.
	names, but I hope it doesn't confuse too many people...

diff --git a/raddb/dictionary b/raddb/dictionary
index 2680e2d..3ab6c15 100644 (file)
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -133,7 +133,7 @@ ATTRIBUTE   Proxy-To-Realm          1048    string
 ATTRIBUTE      Replicate-To-Realm      1049    string
 ATTRIBUTE      Acct-Session-Start-Time 1050    date
 ATTRIBUTE      Acct-Unique-Session-Id  1051    string
-ATTRIBUTE      Request-Src-IP-Address  1052    ipaddr
+ATTRIBUTE      Client-IP-Address       1052    ipaddr
 ATTRIBUTE      Ldap-UserDn             1053    string
 ATTRIBUTE      NS-MTA-MD5-Password     1054    string
 

diff --git a/share/dictionary b/share/dictionary
index 2680e2d..3ab6c15 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -133,7 +133,7 @@ ATTRIBUTE   Proxy-To-Realm          1048    string
 ATTRIBUTE      Replicate-To-Realm      1049    string
 ATTRIBUTE      Acct-Session-Start-Time 1050    date
 ATTRIBUTE      Acct-Unique-Session-Id  1051    string
-ATTRIBUTE      Request-Src-IP-Address  1052    ipaddr
+ATTRIBUTE      Client-IP-Address       1052    ipaddr
 ATTRIBUTE      Ldap-UserDn             1053    string
 ATTRIBUTE      NS-MTA-MD5-Password     1054    string
 

diff --git a/src/include/radius.h b/src/include/radius.h
index d60fdd2..e2b3970 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -103,7 +103,7 @@
 #define PW_REPLICATE_TO_REALM                  1049
 #define PW_ACCT_SESSION_START_TIME     1050
 #define PW_ACCT_UNIQUE_SESSION_ID      1051
-#define PW_REQUEST_SRC_IP_ADDRESS      1052
+#define PW_CLIENT_IP_ADDRESS           1052
 #define LDAP_USERDN                    1053
 #define PW_NS_MTA_MD5_PASSWORD         1054
 

diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c
index 9a558a7..d765edc 100644 (file)
--- a/src/modules/rlm_preprocess/rlm_preprocess.c
+++ b/src/modules/rlm_preprocess/rlm_preprocess.c
@@ -455,11 +455,8 @@ static void add_nas_attr(REQUEST *request)
        }
 
        /*
-        *      Add in a Request-Src-IP-Address, to tell the user
+        *      Add in a Client-IP-Address, to tell the user
         *      the source IP of the request.  That is, the client,
-        *      but Client-IP-Address is too close to the old
-        *      Client-FOO names, which I KNOW would confuse a lot
-        *      of people.
         *
         *      Note that this MAY BE different from the NAS-IP-Address,
         *      especially if the request is being proxied.
@@ -468,7 +465,7 @@ static void add_nas_attr(REQUEST *request)
         *      and will NOT make it to any packets being sent from
         *      the server.
         */
-       nas = paircreate(PW_REQUEST_SRC_IP_ADDRESS, PW_TYPE_IPADDR);
+       nas = paircreate(PW_CLIENT_IP_ADDRESS, PW_TYPE_IPADDR);
        if (!nas) {
          radlog(L_ERR, "No memory");
          exit(1);