Skip to content

Commit 3455a28

Browse files
alandekokalandekok
committed
remove '&'
1 parent 5732d10 commit 3455a28

File tree

12 files changed

+140
-140
lines changed

12 files changed

+140
-140
lines changed

‎raddb/mods-config/files/accounting‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
# Replace the User-Name with the Stripped-User-Name, if it exists.
2121
#
2222
#DEFAULT
23-
# User-Name := "%{&Stripped-User-Name || &User-Name}"
23+
# User-Name := "%{Stripped-User-Name || User-Name}"

‎raddb/mods-config/perl/example.pl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949

5050
# Multi-value attributes are mapped to perl arrayrefs.
5151
#
52-
# &request.Filter-Id := 'foo'
53-
# &request += {
54-
# &Filter-Id = 'bar'
52+
# request.Filter-Id := 'foo'
53+
# request += {
54+
# Filter-Id = 'bar'
5555
# }
5656
#
5757
# This results to the following entry in %RAD_REQUEST:

‎raddb/mods-config/sql/main/cassandra/queries.conf‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# Use Stripped-User-Name, if it's there.
3434
# Else use User-Name, if it's there,
3535
# Else use hard-coded string "DEFAULT" as the user name.
36-
#sql_user_name = "%{&Stripped-User-Name || &User-Name || 'DEFAULT'}"
36+
#sql_user_name = "%{Stripped-User-Name || User-Name || 'DEFAULT'}"
3737
#
3838
sql_user_name = "%{User-Name}"
3939

@@ -49,7 +49,7 @@ sql_user_name = "%{User-Name}"
4949
# distrust the provided Event-Timestamp.
5050
#event_timestamp_epoch = "%l"
5151

52-
event_timestamp_epoch = %{((integer) &Event-Timestamp) || %l}
52+
event_timestamp_epoch = %{((integer) Event-Timestamp) || %l}
5353

5454
# event_timestamp is the SQL snippet for converting an epoch timestamp
5555
# to an SQL date.
@@ -182,7 +182,7 @@ accounting {
182182
'%{SQL-User-Name}', \
183183
'%{Realm}', \
184184
'%{NAS-IP-Address}', \
185-
'%{&NAS-Port-Id || &NAS-Port}', \
185+
'%{NAS-Port-Id || NAS-Port}', \
186186
'%{NAS-Port-Type}', \
187187
${...event_timestamp}, \
188188
${...event_timestamp}, \
@@ -212,7 +212,7 @@ accounting {
212212
acctstarttime \
213213
) VALUES ( \
214214
'%{Acct-Unique-Session-Id}', \
215-
%{(${...event_timestamp_epoch} - &Acct-Session-Time) * 1000} \
215+
%{(${...event_timestamp_epoch} - Acct-Session-Time) * 1000} \
216216
) IF NOT EXISTS; \
217217
INSERT INTO ${...acct_table1} ( \
218218
acctuniqueid, \
@@ -244,14 +244,14 @@ accounting {
244244
'%{SQL-User-Name}', \
245245
'%{Realm}', \
246246
'%{NAS-IP-Address}', \
247-
'%{&NAS-Port-Id || &NAS-Port}', \
247+
'%{NAS-Port-Id || NAS-Port}', \
248248
'%{NAS-Port-Type}', \
249249
${...event_timestamp}, \
250250
null, \
251251
'%{Acct-Authentic}', \
252252
'%{Connect-Info}', \
253-
%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
254-
%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
253+
%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}, \
254+
%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}, \
255255
'%{Called-Station-Id}', \
256256
'%{Calling-Station-Id}', \
257257
'%{Service-Type}', \
@@ -274,7 +274,7 @@ accounting {
274274
acctstarttime \
275275
) VALUES ( \
276276
'%{Acct-Unique-Session-Id}', \
277-
%{(${...event_timestamp_epoch} - &Acct-Session-Time) * 1000} \
277+
%{(${...event_timestamp_epoch} - Acct-Session-Time) * 1000} \
278278
) IF NOT EXISTS; \
279279
INSERT INTO ${...acct_table1} ( \
280280
acctuniqueid, \
@@ -307,14 +307,14 @@ accounting {
307307
'%{SQL-User-Name}', \
308308
'%{Realm}', \
309309
'%{NAS-IP-Address}', \
310-
'%{&NAS-Port-Id || &NAS-Port}', \
310+
'%{NAS-Port-Id || NAS-Port}', \
311311
'%{NAS-Port-Type}', \
312312
${...event_timestamp}, \
313313
${...event_timestamp}, \
314314
'%{Acct-Authentic}', \
315315
'%{Connect-Info}', \
316-
%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
317-
%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
316+
%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}, \
317+
%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}, \
318318
'%{Called-Station-Id}', \
319319
'%{Calling-Station-Id}', \
320320
'%{Service-Type}', \
@@ -349,7 +349,7 @@ send {
349349
(username, pass, reply, authdate, class) \
350350
VALUES ( \
351351
'%{SQL-User-Name}', \
352-
'%{&User-Password || &Chap-Password}', \
352+
'%{User-Password || Chap-Password}', \
353353
'%{reply.Packet-Type}', \
354354
'%{%l * 1000 + %M / 1000}', \
355355
'%{reply.Class}')"

‎raddb/mods-config/sql/main/firebird/queries.conf‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Use Stripped-User-Name, if it's there.
1818
# Else use User-Name, if it's there,
1919
# Else use hard-coded string "DEFAULT" as the user name.
20-
#sql_user_name = "%{&Stripped-User-Name || &User-Name || 'DEFAULT'}"
20+
#sql_user_name = "%{Stripped-User-Name || User-Name || 'DEFAULT'}"
2121
#
2222
sql_user_name = "%{User-Name}"
2323

@@ -33,7 +33,7 @@ sql_user_name = "%{User-Name}"
3333
# distrust the provided Event-Timestamp.
3434
#event_timestamp_epoch = "%l"
3535

36-
event_timestamp_epoch = "%{((integer) &Event-Timestamp) || %l}"
36+
event_timestamp_epoch = "%{((integer) Event-Timestamp) || %l}"
3737

3838
# event_timestamp is the SQL snippet for converting an epoch timestamp
3939
# to an SQL date.
@@ -137,7 +137,7 @@ accounting {
137137
SET \
138138
acctstoptime = ${...event_timestamp}, \
139139
acctsessiontime = DATEDIFF(second, acctstarttime, '${...event_timestamp}'), \
140-
acctterminatecause = '%{&Acct-Terminate-Cause || 'NAS-Reboot'}' \
140+
acctterminatecause = '%{Acct-Terminate-Cause || 'NAS-Reboot'}' \
141141
WHERE acctstoptime IS NULL \
142142
AND nasipaddress = '%{NAS-IP-Address}' \
143143
AND acctstarttime <= ${...event_timestamp}"
@@ -191,7 +191,7 @@ accounting {
191191
'%{SQL-User-Name}', \
192192
'%{Realm}', \
193193
'%{NAS-IP-Address}', \
194-
'%{&NAS-Port-ID || &NAS-Port}', \
194+
'%{NAS-Port-ID || NAS-Port}', \
195195
'%{NAS-Port-Type}', \
196196
${...event_timestamp}, \
197197
${...event_timestamp}, \
@@ -243,9 +243,9 @@ accounting {
243243
framedipv6prefix = '%{Framed-IPv6-Prefix}', \
244244
framedinterfaceid = '%{Framed-Interface-Id}', \
245245
delegatedipv6prefix = '%{Delegated-IPv6-Prefix}', \
246-
acctsessiontime = %{&Acct-Session-Time || 'NULL'}, \
247-
acctinputoctets = %{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}, \
248-
acctoutputoctets = %{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}, \
246+
acctsessiontime = %{Acct-Session-Time || 'NULL'}, \
247+
acctinputoctets = %{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}, \
248+
acctoutputoctets = %{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}, \
249249
class = '%{Class}' \
250250
WHERE acctuniqueid = '%{Acct-Unique-Session-Id}'"
251251

@@ -262,17 +262,17 @@ accounting {
262262
'%{SQL-User-Name}', \
263263
'%{Realm}', \
264264
'%{NAS-IP-Address}', \
265-
'%{&NAS-Port-ID || &NAS-Port}', \
265+
'%{NAS-Port-ID || NAS-Port}', \
266266
'%{NAS-Port-Type}', \
267-
DATEADD((${...event_timestamp_epoch} - %{&Acct-Session-Time || 0}) SECOND TO TIMESTAMP '1970-01-01 00:00:00'), \
267+
DATEADD((${...event_timestamp_epoch} - %{Acct-Session-Time || 0}) SECOND TO TIMESTAMP '1970-01-01 00:00:00'), \
268268
${...event_timestamp}, \
269269
NULL, \
270-
%{&Acct-Session-Time || 'NULL'}, \
270+
%{Acct-Session-Time || 'NULL'}, \
271271
'%{Acct-Authentic}', \
272272
'%{Connect-Info}', \
273273
'', \
274-
'%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}', \
275-
'%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}', \
274+
'%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}', \
275+
'%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}', \
276276
'%{Called-Station-Id}', \
277277
'%{Calling-Station-Id}', \
278278
'', \
@@ -293,9 +293,9 @@ accounting {
293293
query = "\
294294
UPDATE ${...acct_table2} SET \
295295
acctstoptime = ${...event_timestamp}, \
296-
acctsessiontime = %{&Acct-Session-Time || 'NULL'}, \
297-
acctinputoctets = '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}', \
298-
acctoutputoctets = '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}', \
296+
acctsessiontime = %{Acct-Session-Time || 'NULL'}, \
297+
acctinputoctets = '%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}', \
298+
acctoutputoctets = '%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}', \
299299
acctterminatecause = '%{Acct-Terminate-Cause}', \
300300
connectinfo_stop = '%{Connect-Info}', \
301301
class = '%{Class}' \
@@ -314,17 +314,17 @@ accounting {
314314
'%{SQL-User-Name}', \
315315
'%{Realm}', \
316316
'%{NAS-IP-Address}', \
317-
'%{&NAS-Port-ID || &NAS-Port}', \
317+
'%{NAS-Port-ID || NAS-Port}', \
318318
'%{NAS-Port-Type}', \
319-
DATEADD((${...event_timestamp_epoch} - %{&Acct-Session-Time || 0}) SECOND TO TIMESTAMP '1970-01-01 00:00:00'), \
319+
DATEADD((${...event_timestamp_epoch} - %{Acct-Session-Time || 0}) SECOND TO TIMESTAMP '1970-01-01 00:00:00'), \
320320
${...event_timestamp}, \
321321
${...event_timestamp}, \
322-
%{&Acct-Session-Time || 'NULL'}, \
322+
%{Acct-Session-Time || 'NULL'}, \
323323
'%{Acct-Authentic}', \
324324
'', \
325325
'%{Connect-Info}', \
326-
'%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}', \
327-
'%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}', \
326+
'%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}', \
327+
'%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}', \
328328
'%{Called-Station-Id}', \
329329
'%{Calling-Station-Id}', \
330330
'%{Acct-Terminate-Cause}', \
@@ -357,7 +357,7 @@ send {
357357
(username, pass, reply, authdate, class) \
358358
VALUES ( \
359359
'%{SQL-User-Name}', \
360-
'%{&User-Password || &Chap-Password}', \
360+
'%{User-Password || Chap-Password}', \
361361
'%{reply.Packet-Type}', \
362362
'%S.%M', \
363363
'%{reply.Class}')"

‎raddb/mods-config/sql/main/mssql/queries.conf‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Use Stripped-User-Name, if it's there.
2323
# Else use User-Name, if it's there,
2424
# Else use hard-coded string "none" as the user name.
25-
#sql_user_name = "%{&Stripped-User-Name || &User-Name || 'none'}"
25+
#sql_user_name = "%{Stripped-User-Name || User-Name || 'none'}"
2626
#
2727
sql_user_name = "%{User-Name}"
2828

@@ -38,7 +38,7 @@ sql_user_name = "%{User-Name}"
3838
# distrust the provided Event-Timestamp.
3939
#event_timestamp_epoch = "%l"
4040

41-
event_timestamp_epoch = %{((integer) &Event-Timestamp) || %l}
41+
event_timestamp_epoch = %{((integer) Event-Timestamp) || %l}
4242

4343
# event_timestamp is the SQL snippet for converting an epoch timestamp
4444
# to an SQL date.
@@ -121,7 +121,7 @@ accounting {
121121
AcctStopTime=${...event_timestamp}, \
122122
AcctSessionTime=${...event_timestamp_epoch} - \
123123
DATEDIFF(SS, '1970-01-01', AcctStartTime), \
124-
AcctTerminateCause='%{&Acct-Terminate-Cause || 'NAS-Reboot'}' \
124+
AcctTerminateCause='%{Acct-Terminate-Cause || 'NAS-Reboot'}' \
125125
WHERE AcctStopTime = 0 \
126126
AND NASIPAddress = '%{NAS-IP-Address}' \
127127
AND AcctStartTime <= ${...event_timestamp}"
@@ -174,7 +174,7 @@ accounting {
174174
'%{SQL-User-Name}', \
175175
'%{Realm}', \
176176
'%{NAS-IP-Address}', \
177-
'%{&NAS-Port-ID || &NAS-Port}', \
177+
'%{NAS-Port-ID || NAS-Port}', \
178178
'%{NAS-Port-Type}', \
179179
${...event_timestamp}, \
180180
'0', \
@@ -211,8 +211,8 @@ accounting {
211211
AcctInterval = DATEDIFF(second, CASE WHEN AcctUpdateTime > 0 THEN AcctUpdateTime ELSE AcctStartTime END, ${...event_timestamp}), \
212212
AcctUpdateTime = ${...event_timestamp}, \
213213
AcctSessionTime = '%{Acct-Session-Time}', \
214-
AcctInputOctets = convert(bigint, '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}'), \
215-
AcctOutputOctets = convert(bigint, '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}'), \
214+
AcctInputOctets = convert(bigint, '%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}'), \
215+
AcctOutputOctets = convert(bigint, '%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}'), \
216216
FramedIPAddress = '%{Framed-IP-Address}', \
217217
FramedIPv6Address = '%{Framed-IPv6-Address}', \
218218
FramedIPv6Prefix = '%{Framed-IPv6-Prefix}', \
@@ -254,7 +254,7 @@ accounting {
254254
'%{SQL-User-Name}', \
255255
'%{Realm}', \
256256
'%{NAS-IP-Address}', \
257-
'%{&NAS-Port-ID || &NAS-Port}', \
257+
'%{NAS-Port-ID || NAS-Port}', \
258258
'%{NAS-Port-Type}', \
259259
${...event_timestamp}, \
260260
${...event_timestamp}, \
@@ -281,8 +281,8 @@ accounting {
281281
SET \
282282
AcctStopTime = ${...event_timestamp}, \
283283
AcctSessionTime = '%{Acct-Session-Time}', \
284-
AcctInputOctets = convert(bigint, '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}'), \
285-
AcctOutputOctets = convert(bigint, '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}'), \
284+
AcctInputOctets = convert(bigint, '%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}'), \
285+
AcctOutputOctets = convert(bigint, '%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}'), \
286286
AcctTerminateCause = '%{Acct-Terminate-Cause}', \
287287
ConnectInfo_stop = '%{Connect-Info}', \
288288
Class = '%{Class}' \
@@ -322,15 +322,15 @@ accounting {
322322
'%{SQL-User-Name}', \
323323
'%{Realm}', \
324324
'%{NAS-IP-Address}', \
325-
'%{&NAS-Port-ID || &NAS-Port}', \
325+
'%{NAS-Port-ID || NAS-Port}', \
326326
'%{NAS-Port-Type}', \
327327
${...event_timestamp}, \
328328
'%{Acct-Session-Time}', \
329329
'%{Acct-Authentic}', \
330330
'', \
331331
'%{Connect-Info}', \
332-
convert(bigint, '%{(((uint64) &Acct-Input-Gigawords) << 32) | (uint64) &Acct-Input-Octets}'), \
333-
convert(bigint, '%{(((uint64) &Acct-Output-Gigawords) << 32) | (uint64) &Acct-Output-Octets}'), \
332+
convert(bigint, '%{(((uint64) Acct-Input-Gigawords) << 32) | (uint64) Acct-Input-Octets}'), \
333+
convert(bigint, '%{(((uint64) Acct-Output-Gigawords) << 32) | (uint64) Acct-Output-Octets}'), \
334334
'%{Called-Station-Id}', \
335335
'%{Calling-Station-Id}', \
336336
'%{Acct-Terminate-Cause}', \
@@ -357,7 +357,7 @@ send {
357357
(userName, pass, reply, authdate, class) \
358358
VALUES(\
359359
'%{User-Name}', \
360-
'%{&User-Password || &Chap-Password}', \
360+
'%{User-Password || Chap-Password}', \
361361
'%{reply.Packet-Type}', \
362362
'%S.%{%M / 1000}', \
363363
'%{reply.Class}')"

‎raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Use Stripped-User-Name, if it's there.
2323
# Else use User-Name, if it's there,
2424
# Else use hard-coded string "DEFAULT" as the user name.
25-
#sql_user_name = "%{&Stripped-User-Name} || &User-Name || 'DEFAULT'}}"
25+
#sql_user_name = "%{Stripped-User-Name} || User-Name || 'DEFAULT'}}"
2626
#
2727
sql_user_name = "%{User-Name}"
2828

@@ -36,5 +36,5 @@ postauth_query = "INSERT INTO wimax \
3636
(username, authdate, spi, mipkey, lifetime) \
3737
VALUES ( \
3838
'%{User-Name}', '%S' \
39-
'%{&reply.WiMAX.MN-hHA-MIP4-SPI || &reply.WiMAX.MN-hHA-MIP6-SPI}', \
40-
'%{&reply.WiMAX.MN-hHA-MIP4-Key || &reply.WiMAX.MN-hHA-MIP6-Key}', '%{&reply.Session-Timeout || 86400}' )"
39+
'%{reply.WiMAX.MN-hHA-MIP4-SPI || reply.WiMAX.MN-hHA-MIP6-SPI}', \
40+
'%{reply.WiMAX.MN-hHA-MIP4-Key || reply.WiMAX.MN-hHA-MIP6-Key}', '%{reply.Session-Timeout || 86400}' )"

0 commit comments

Comments
 (0)