add :: for Service-Type

perl -p -i -e 's/Service-Type(\s+(:=|=|==)\s+)([a-zA-Z])/Service-Type$1::$3/'  $(git grep -l 'Service-Type' src/tests raddb/)

except we don't so src/tests/unit, as the printing routines don't
print :: before enum names.  and the parsing routines don't set
t_rules->enumv, so parsing the enum doesn't work

diff --git a/raddb/mods-config/attr_filter/post-proxy b/raddb/mods-config/attr_filter/post-proxy
index df43e1804c173cb03ddd173ba2dedbbf4409b5bc..e30460eb9e0081ac92fdd33cffb1152b6c1a97be 100644 (file)
--- a/raddb/mods-config/attr_filter/post-proxy
+++ b/raddb/mods-config/attr_filter/post-proxy
@@ -43,7 +43,7 @@
 #     o  a max session time set to 28800 seconds (8 hours) or less
 #
 #fisp
-#      Service-Type == Framed-User,
+#      Service-Type == ::Framed-User,
 #      Framed-Protocol == PPP,
 #      Framed-IP-Address == 255.255.255.254,
 #      Idle-Timeout <= 600,
@@ -61,7 +61,7 @@
 #       o Login hosts of either 192.0.2.1 or 192.0.2.2
 #
 #tisp
-#      Service-Type == Login-User,
+#      Service-Type == ::Login-User,
 #      Login-Service == Telnet,
 #      Login-TCP-Port == 23,
 #      Login-IP-Host == 192.0.2.1,
@@ -101,8 +101,8 @@
 #
 
 DEFAULT
-       Service-Type == Framed-User,
-       Service-Type == Login-User,
+       Service-Type == ::Framed-User,
+       Service-Type == ::Login-User,
        Login-Service == Telnet,
        Login-Service == Rlogin,
        Login-Service == TCP-Clear,

diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize
index a1a9a65b4fc6086fd851e9f96e706d4e5efd1322..14d0dbb1bbcaf37f9fe93b6d35145019cf3c762f 100644 (file)
--- a/raddb/mods-config/files/authorize
+++ b/raddb/mods-config/files/authorize
@@ -58,7 +58,7 @@
 # get any attributes in addition to the ones listed here.
 #
 #steve Password.Cleartext := "testing"
-#      Service-Type = Framed-User,
+#      Service-Type = ::Framed-User,
 #      Framed-Protocol = PPP,
 #      Framed-IP-Address = 172.16.3.33,
 #      Framed-IP-Netmask = 255.255.255.0,
@@ -90,7 +90,7 @@
 # Dial user back and telnet to the default host for that port
 #
 #Deg   Password.Cleartext := "ge55ged"
-#      Service-Type = Callback-Login-User,
+#      Service-Type = ::Callback-Login-User,
 #      Login-IP-Host = 0.0.0.0,
 #      Callback-Number = "9,5551212",
 #      Login-Service = Telnet,
@@ -102,7 +102,7 @@
 # he will get a connection to the host "timeshare1".
 #
 #dialbk        Password.Cleartext := "callme"
-#      Service-Type = Callback-Login-User,
+#      Service-Type = ::Callback-Login-User,
 #      Login-IP-Host = timeshare1,
 #      Login-Service = PortMaster,
 #      Callback-Number = "9,1-800-555-1212"
@@ -114,7 +114,7 @@
 # Note that by setting "Fall-Through", other attributes will be added from
 # the following DEFAULT entries
 #
-#swilson       Service-Type == Framed-User, Huntgroup-Name == "alphen"
+#swilson       Service-Type == ::Framed-User, Huntgroup-Name == "alphen"
 #              Framed-IP-Address = 192.0.2.65,
 #              Fall-Through = Yes
 
@@ -129,10 +129,10 @@
 #
 # Sample defaults for all framed connections.
 #
-#DEFAULT       Service-Type == Framed-User
+#DEFAULT       Service-Type == ::Framed-User
 #      Framed-IP-Address = 255.255.255.254,
 #      Framed-MTU = 576,
-#      Service-Type = Framed-User,
+#      Service-Type = ::Framed-User,
 #      Fall-Through = Yes
 
 #
@@ -146,7 +146,7 @@ DEFAULT     Framed-Protocol == PPP
 # Last default: rlogin to our main server.
 #
 #DEFAULT
-#      Service-Type = Login-User,
+#      Service-Type = ::Login-User,
 #      Login-Service = Rlogin,
 #      Login-IP-Host = shellbox.ispdomain.com
 
@@ -154,7 +154,7 @@ DEFAULT     Framed-Protocol == PPP
 # # Last default: shell on the local terminal server.
 # #
 # DEFAULT
-#      Service-Type = Administrative-User
+#      Service-Type = ::Administrative-User
 
 
 # On no match, the user is denied access.

diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index 0cf752486788d15c7f62d13455cc25f609e07e68..de8d3aa2967bef894f33b7bdae92bc7122c9e793 100644 (file)
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -1105,7 +1105,7 @@ send Access-Accept {
        #
        #  If you need to have a State attribute, you can add it
        #  here. e.g. for later CoA-Request with State, and
-       #  Service-Type = Authorize-Only.
+       #  Service-Type = ::Authorize-Only.
        #
 #      if (!&reply.State) {
 #              &reply.State := "0x%randstr(16h)"

diff --git a/src/tests/modules/json/encode.attrs b/src/tests/modules/json/encode.attrs
index bdf0b69931494ebf99c646941e723462d1be0224..6ee1857640dd924452c0142365abc2a08f19771b 100644 (file)
--- a/src/tests/modules/json/encode.attrs
+++ b/src/tests/modules/json/encode.attrs
@@ -6,7 +6,7 @@ User-Name = 'john'
 Filter-Id = "f1"
 Filter-Id += "f2"
 NAS-Port = 999
-Service-Type = Login-User
+Service-Type = ::Login-User
 
 #
 #  Expected answer

diff --git a/src/tests/modules/ldap/acct.attrs b/src/tests/modules/ldap/acct.attrs
index 9965204587e02a0e6523dbd67b28da31002dbf69..f4b718a019c2a9ad44a4c055be16830aa4057e31 100644 (file)
--- a/src/tests/modules/ldap/acct.attrs
+++ b/src/tests/modules/ldap/acct.attrs
@@ -22,7 +22,7 @@ Acct-Output-Gigawords = 0
 Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/modules/radutmp/test.attrs b/src/tests/modules/radutmp/test.attrs
index 9975efe7ab237274cc0879b186c5de956f42c106..b2693a63d2606958209768a2d347fc10e2faaafc 100644 (file)
--- a/src/tests/modules/radutmp/test.attrs
+++ b/src/tests/modules/radutmp/test.attrs
@@ -20,7 +20,7 @@ Acct-Output-Gigawords = 0
 Event-Timestamp = 'Feb  1 2024 08:28:58 GMT'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Idle-Timeout = 0
 Session-Timeout = 604800

diff --git a/src/tests/modules/sql/acct_0_start.attrs b/src/tests/modules/sql/acct_0_start.attrs
index d5114b0a9232df881b2726ec9fd8dc51e28e0594..3a6d468195531ec7574a868ae09e0b9474fa015d 100644 (file)
--- a/src/tests/modules/sql/acct_0_start.attrs
+++ b/src/tests/modules/sql/acct_0_start.attrs
@@ -22,7 +22,7 @@ Acct-Output-Gigawords = 0
 Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/modules/sql/acct_1_update.attrs b/src/tests/modules/sql/acct_1_update.attrs
index d94eb20a1c7cb2e8406080ed87af38861528813c..a1d2eaad287ccd4705722dc76e0eaebde6c92797 100644 (file)
--- a/src/tests/modules/sql/acct_1_update.attrs
+++ b/src/tests/modules/sql/acct_1_update.attrs
@@ -22,7 +22,7 @@ Acct-Output-Gigawords = 1
 Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/modules/sql/acct_2_stop.attrs b/src/tests/modules/sql/acct_2_stop.attrs
index cc98d4ccbf5fab7ab88ecb1b9cb1c071a34f9f41..53fb318d7756b6d8e4e4de2060e518dd61348e08 100644 (file)
--- a/src/tests/modules/sql/acct_2_stop.attrs
+++ b/src/tests/modules/sql/acct_2_stop.attrs
@@ -23,7 +23,7 @@ Acct-Output-Gigawords = 1
 Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/modules/sql/acct_start_conflict.attrs b/src/tests/modules/sql/acct_start_conflict.attrs
index d7270a61dcc0c3a0fcdaea4f9adbacf806a05b39..7b7816de98717f4648f5a139ae103a3cf95e47f8 100644 (file)
--- a/src/tests/modules/sql/acct_start_conflict.attrs
+++ b/src/tests/modules/sql/acct_start_conflict.attrs
@@ -22,7 +22,7 @@ Acct-Output-Gigawords = 0
 Event-Timestamp = 'Feb  1 2015 08:28:58 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/modules/sql/acct_update_no_start.attrs b/src/tests/modules/sql/acct_update_no_start.attrs
index f08ab789e68227b83c14fcd7d9dc10c2094d4808..7c96a3a5145262dd398ee12de6333315a8c20030 100644 (file)
--- a/src/tests/modules/sql/acct_update_no_start.attrs
+++ b/src/tests/modules/sql/acct_update_no_start.attrs
@@ -22,7 +22,7 @@ Acct-Output-Gigawords = 1
 Event-Timestamp = 'Feb  1 2015 08:28:28 WIB'
 NAS-Port-Type = Ethernet
 NAS-Port-Id = 'port 001'
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0

diff --git a/src/tests/performance/packets/packet-acct.txt b/src/tests/performance/packets/packet-acct.txt
index e48e54f519c23774ebcc4ac1afcaec76c468c85d..440a895595d68063796ef40162832636a1094748 100644 (file)
--- a/src/tests/performance/packets/packet-acct.txt
+++ b/src/tests/performance/packets/packet-acct.txt
@@ -1,7 +1,7 @@
 Acct-Status-Type = Start
 User-Name = "testuser"
 Acct-Session-ID = "0123456789"
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 NAS-IP-Address = 127.0.0.1
 NAS-Port-ID = 0
 Message-Authenticator = 0x

diff --git a/src/tests/performance/packets/packet-auth_pap.txt b/src/tests/performance/packets/packet-auth_pap.txt
index f99fc3aa9a20460d550651202a1ea4d9b8702e11..cfa61e2515b1ade8cef251499ec857a6d718b4dd 100644 (file)
--- a/src/tests/performance/packets/packet-auth_pap.txt
+++ b/src/tests/performance/packets/packet-auth_pap.txt
@@ -1,6 +1,6 @@
 User-Name = "testuser"
 User-Password = "supersecret"
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 #Tunnel-Password = "supersecret"
 Called-Station-Id = "scald_pega_pilha"
 Class = 0x69616D616E6F706171756576616C756569616D616E6F706171756576616C7565

diff --git a/src/tests/performance/packets/packet-coa.txt b/src/tests/performance/packets/packet-coa.txt
index 080f08d90faf2a3927e53499e8a4e3bb02115315..d50767712328996088e8aec961d2a64f062eadb0 100644 (file)
--- a/src/tests/performance/packets/packet-coa.txt
+++ b/src/tests/performance/packets/packet-coa.txt
@@ -1,6 +1,6 @@
 User-Name = "testuser"
 Acct-Session-ID = "0123456789"
-Service-Type = Framed-User
+Service-Type = ::Framed-User
 NAS-IP-Address = 127.0.0.1
 NAS-Port-ID = 0
 Message-Authenticator = 0x
\ No newline at end of file

diff --git a/src/tests/radsniff/chunk-packets-debug-mode.txt b/src/tests/radsniff/chunk-packets-debug-mode.txt
index 14d5f8ec84b716885c4e930db10b04a07724aa98..d65ca9e7be930b1f912536469e7ec83c79dd60dd 100644 (file)
--- a/src/tests/radsniff/chunk-packets-debug-mode.txt
+++ b/src/tests/radsniff/chunk-packets-debug-mode.txt
@@ -11,7 +11,7 @@ Sniffing on (build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap)
         Reply-Message = "Hello, bob"
 2020-05-21 00:56:58.652076 (2) Access-Accept Id 243 build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap:127.0.0.1:57389 <- 127.0.0.1:1812 +0.001 +0.001
        Authenticator-Field = 0xc27d2fc97ff6b40202404fa1eba447fc
-        Service-Type = Framed-User
+        Service-Type = ::Framed-User
         User-Name = "testuser"
         NAS-IP-Address = 127.0.0.1
         NAS-Port = 123
@@ -25,7 +25,7 @@ Sniffing on (build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap)
        Authenticator-Field = 0x4279b1ea045f3ae6da9643ef14656468
 2020-05-21 00:56:59.790790 (4) Accounting-Response Id 89 build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap:127.0.0.1:63467 <- 127.0.0.1:1813 +0.428 +0.002
        Authenticator-Field = 0x113000da9020f10c71b6c248d4dda6bf
-        Service-Type = Framed-User
+        Service-Type = ::Framed-User
         User-Name = "scald_left_lemos"
         NAS-IP-Address = 127.0.0.1
         Acct-Session-Id = "0123456789"
@@ -43,7 +43,7 @@ Sniffing on (build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap)
         Reply-Message = "Hello, bob"
 2020-05-21 00:56:59.930695 (8) Access-Accept Id 96 build/tests/radsniff/radius-auth+acct+coa-100pkts.pcap:127.0.0.1:49655 <- 127.0.0.1:1812 +1.279 +0.001
        Authenticator-Field = 0xfb31422fb507b80be6518f14005a86dc
-        Service-Type = Framed-User
+        Service-Type = ::Framed-User
         User-Name = "testuser"
         NAS-IP-Address = 127.0.0.1
         NAS-Port = 123