From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 Nov 2010 08:42:51 +0000 (+0100)
Subject: NAS-Port is a text field.  Don't cast it to integer
X-Git-Tag: release_2_1_11~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6365301c40db99a7f51922f287e17beae514db13;p=thirdparty%2Ffreeradius-server.git

NAS-Port is a text field.  Don't cast it to integer

This solves the 2^31+1 problem.  Closes bug #112
---

diff --git a/raddb/sql/postgresql/dialup.conf b/raddb/sql/postgresql/dialup.conf
index 5ff1e27914c..aa1907f2886 100644
--- a/raddb/sql/postgresql/dialup.conf
+++ b/raddb/sql/postgresql/dialup.conf
@@ -182,7 +182,7 @@ accounting_update_query_alt = "INSERT INTO ${acct_table1} \
   ServiceType, FramedProtocol, FramedIPAddress, XAscendSessionSvrKey) \
   VALUES('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
   '%{SQL-User-Name}', NULLIF('%{Realm}', ''), '%{NAS-IP-Address}', \
-  %{%{NAS-Port}:-NULL}::integer, '%{NAS-Port-Type}', \
+  %{%{NAS-Port}:-NULL}, '%{NAS-Port-Type}', \
   ('%S'::timestamp - '%{%{Acct-Delay-Time}:-0}'::interval - '%{%{Acct-Session-Time}:-0}'::interval), \
   '%{Acct-Session-Time}', '%{Acct-Authentic}', \
   (('%{%{Acct-Input-Gigawords}:-0}'::bigint << 32) + '%{%{Acct-Input-Octets}:-0}'::bigint), \
@@ -201,7 +201,7 @@ accounting_start_query = "INSERT INTO ${acct_table1} \
   '%{SQL-User-Name}', \
   NULLIF('%{Realm}', ''), \
   '%{NAS-IP-Address}', \
-  %{%{NAS-Port}:-NULL}::integer, \
+  %{%{NAS-Port}:-NULL}, \
   '%{NAS-Port-Type}', \
   ('%S'::timestamp - '%{%{Acct-Delay-Time}:-0}'::interval), \
   '%{Acct-Authentic}', \
@@ -249,7 +249,7 @@ accounting_stop_query_alt = "INSERT INTO ${acct_table2} \
   '%{SQL-User-Name}', \
   NULLIF('%{Realm}', ''), \
   '%{NAS-IP-Address}', \
-  %{%{NAS-Port}:-NULL}::integer, \
+  %{%{NAS-Port}:-NULL}, \
   '%{NAS-Port-Type}', \
   ('%S'::timestamp - '%{%{Acct-Delay-Time}:-0}'::interval - '%{%{Acct-Session-Time}:-0}'::interval), \
   ('%S'::timestamp - '%{%{Acct-Delay-Time}:-0}'::interval), \