Oops. Cant use 2.0 variable substitiution on 1.1.x

diff --git a/raddb/sql.conf b/raddb/sql.conf
index 7fb611a..28eace0 100644 (file)
--- a/raddb/sql.conf
+++ b/raddb/sql.conf
@@ -176,10 +176,10 @@ sql {
           SET \
              FramedIPAddress = '%{Framed-IP-Address}', \
              AcctSessionTime     = '%{Acct-Session-Time}', \
-             AcctInputOctets     = '%{%{Acct-Input-Gigawords}:-0}'  << 32 | \
-                                   '%{%{Acct-Input-Octets}:-0}', \
-             AcctOutputOctets    = '%{%{Acct-Output-Gigawords}:-0}' << 32 | \
-                                   '%{%{Acct-Output-Octets}:-0}' \
+             AcctInputOctets     = '%{Acct-Input-Gigawords:-0}'  << 32 | \
+                                   '%{Acct-Input-Octets:-0}', \
+             AcctOutputOctets    = '%{Acct-Output-Gigawords:-0}' << 32 | \
+                                   '%{Acct-Output-Octets:-0}' \
           WHERE AcctSessionId = '%{Acct-Session-Id}' \
           AND UserName        = '%{SQL-User-Name}' \
           AND NASIPAddress    = '%{NAS-IP-Address}'"
@@ -200,14 +200,14 @@ sql {
              '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
              '%{NAS-Port-Type}', \
              DATE_SUB('%S', \
-                      INTERVAL (%{%{Acct-Session-Time}:-0} + \
-                                %{%{Acct-Delay-Time}:-0}) SECOND), \
+                      INTERVAL (%{Acct-Session-Time:-0} + \
+                                %{Acct-Delay-Time:-0}) SECOND), \
                       '%{Acct-Session-Time}', \
              '%{Acct-Authentic}', '', \
-             '%{%{Acct-Input-Gigawords}:-0}' << 32 | \
-             '%{%{Acct-Input-Octets}:-0}', \
-             '%{%{Acct-Output-Gigawords}:-0}' << 32 | \
-             '%{%{Acct-Output-Octets}:-0}', \
+             '%{Acct-Input-Gigawords:-0}' << 32 | \
+             '%{Acct-Input-Octets:-0}', \
+             '%{Acct-Output-Gigawords:-0}' << 32 | \
+             '%{Acct-Output-Octets:-0}', \
              '%{Called-Station-Id}', '%{Calling-Station-Id}', \
              '%{Service-Type}', '%{Framed-Protocol}', \
              '%{Framed-IP-Address}', \
@@ -233,7 +233,7 @@ sql {
              '', '0', '0', \
              '%{Called-Station-Id}', '%{Calling-Station-Id}', '', \
              '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', \
-             '%{%{Acct-Delay-Time}:-0}', '0', '%{X-Ascend-Session-Svr-Key}')"
+             '%{Acct-Delay-Time:-0}', '0', '%{X-Ascend-Session-Svr-Key}')"
 
        accounting_start_query_alt  = "UPDATE ${acct_table1} SET AcctStartTime = '%S', AcctStartDelay = '%{Acct-Delay-Time}', ConnectInfo_start = '%{Connect-Info}' WHERE AcctSessionId = '%{Acct-Session-Id}' AND UserName = '%{SQL-User-Name}' AND NASIPAddress = '%{NAS-IP-Address}'"
 
@@ -242,12 +242,12 @@ sql {
           UPDATE ${acct_table2} SET \
              AcctStopTime       = '%S', \
              AcctSessionTime    = '%{Acct-Session-Time}', \
-             AcctInputOctets    = '%{%{Acct-Input-Gigawords}:-0}' << 32 | \
-                                  '%{%{Acct-Input-Octets}:-0}', \
-             AcctOutputOctets   = '%{%{Acct-Output-Gigawords}:-0}' << 32 | \
-                                  '%{%{Acct-Output-Octets}:-0}', \
+             AcctInputOctets    = '%{Acct-Input-Gigawords:-0}' << 32 | \
+                                  '%{Acct-Input-Octets:-0}', \
+             AcctOutputOctets   = '%{Acct-Output-Gigawords:-0}' << 32 | \
+                                  '%{Acct-Output-Octets:-0}', \
              AcctTerminateCause = '%{Acct-Terminate-Cause}', \
-             AcctStopDelay      = '%{%{Acct-Delay-Time}:-0}', \
+             AcctStopDelay      = '%{Acct-Delay-Time:-0}', \
              ConnectInfo_stop   = '%{Connect-Info}' \
           WHERE AcctSessionId   = '%{Acct-Session-Id}' \
           AND UserName          = '%{SQL-User-Name}' \
@@ -270,18 +270,18 @@ sql {
              '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
              '%{NAS-Port-Type}', \
              DATE_SUB('%S', \
-                 INTERVAL (%{%{Acct-Session-Time}:-0} + \
-                 %{%{Acct-Delay-Time}:-0}) SECOND), \
+                 INTERVAL (%{Acct-Session-Time:-0} + \
+                 %{Acct-Delay-Time:-0}) SECOND), \
              '%S', '%{Acct-Session-Time}', '%{Acct-Authentic}', '', \
              '%{Connect-Info}', \
-             '%{%{Acct-Input-Gigawords}:-0}' << 32 | \
-             '%{%{Acct-Input-Octets}:-0}', \
-             '%{%{Acct-Output-Gigawords}:-0}' << 32 | \
-             '%{%{Acct-Output-Octets}:-0}', \
+             '%{Acct-Input-Gigawords:-0}' << 32 | \
+             '%{Acct-Input-Octets:-0}', \
+             '%{Acct-Output-Gigawords:-0}' << 32 | \
+             '%{Acct-Output-Octets:-0}', \
              '%{Called-Station-Id}', '%{Calling-Station-Id}', \
              '%{Acct-Terminate-Cause}', \
              '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', \
-             '0', '%{%{Acct-Delay-Time}:-0}')"
+             '0', '%{Acct-Delay-Time:-0}')"
 
 
        #######################################################################