From 05b93e176889c46b298da59e175f4d44aefde15a Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Fri, 31 Jan 2025 07:12:22 -0500 Subject: [PATCH] clean up last bits of "&" manually --- raddb/sites-available/bfd | 2 +- raddb/sites-available/default | 4 ++-- raddb/sites-available/dhcp | 2 +- raddb/sites-available/dns | 12 ++++++------ raddb/sites-available/eap-aka-sim | 6 +++--- raddb/sites-available/ldap_sync | 12 ++++++------ raddb/sites-available/originate-coa | 2 +- raddb/sites-available/vmps | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/raddb/sites-available/bfd b/raddb/sites-available/bfd index 8630c1c7ed..dbdb8e328e 100644 --- a/raddb/sites-available/bfd +++ b/raddb/sites-available/bfd @@ -232,7 +232,7 @@ send Up { # Sneak in more data after a BFD packet! # # reply.Additional-Data := { -# &more-data := 0xabcdef +# more-data := 0xabcdef # } } diff --git a/raddb/sites-available/default b/raddb/sites-available/default index f992bf7ea0..951ffcc7ac 100644 --- a/raddb/sites-available/default +++ b/raddb/sites-available/default @@ -1191,8 +1191,8 @@ send Access-Accept { # # reply += { # Vendor-Specific.WiMAX = { -# &FA-RK-Key = 0x00 -# &MSK = reply.EAP-MSK +# FA-RK-Key = 0x00 +# MSK = reply.EAP-MSK # } # } diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp index 26a581fc64..bc97abd58b 100644 --- a/raddb/sites-available/dhcp +++ b/raddb/sites-available/dhcp @@ -186,7 +186,7 @@ recv Request { control.Server-Identifier = 192.0.2.1 # If the request is not for this server then silently discard it - if (request.Server-Identifier && \ + if (request.Server-Identifier && request.Server-Identifier != control.Server-Identifier) { do_not_respond } diff --git a/raddb/sites-available/dns b/raddb/sites-available/dns index 238ece4f18..72033b6680 100644 --- a/raddb/sites-available/dns +++ b/raddb/sites-available/dns @@ -20,7 +20,7 @@ # It's meant to be a _flexible_ DNS server. Want to give different answers to VoIP phones # and desktops, or other types of split horizon? It can do that. # -# Because DNS uses the &Header.Rcode to communicate the result of a query (instead of opcode) +# Because DNS uses the Header.Rcode to communicate the result of a query (instead of opcode) # the DNS state machine works differently to other protocols. # # Requests will pass through the following processing sections: @@ -61,11 +61,11 @@ server dns { recv Query { if (Question[0].Name == 'foo.example.com') { reply.Resource-Record := { - &Name = 'foo.example.com' - &Type = A - &Class = ::Internet - &TTL = 0 - &Type.A.IP = 127.0.0.1 + Name = 'foo.example.com' + Type = ::A + Class = ::Internet + TTL = 0 + Type.A.IP = 127.0.0.1 } } diff --git a/raddb/sites-available/eap-aka-sim b/raddb/sites-available/eap-aka-sim index e755b58c0f..cf5361c1d4 100644 --- a/raddb/sites-available/eap-aka-sim +++ b/raddb/sites-available/eap-aka-sim @@ -347,7 +347,7 @@ server eap-aka-sim { # If for whatever reason the identity cannot be validated, you should # return `notfound` to request an additional identity. # - # NOTE: Setting `&Method-Hint = Pseudonym` here will cause the server + # NOTE: Setting `Method-Hint = Pseudonym` here will cause the server # to execute the `load pseudonym { ... }` section next. This is # sometimes useful when dealing with non-standard pseudonym identities. # @@ -362,7 +362,7 @@ server eap-aka-sim { # If the identity cannot be resolved, you should return `notfound` to # request an additional identity. # - # NOTE: Setting `&Method-Hint = Fastauth` here will cause the server + # NOTE: Setting `Method-Hint = Fastauth` here will cause the server # to execute the `load session { ... }` section next. This is # sometimes useful when dealing with non-standard fastauth identities. # @@ -677,7 +677,7 @@ server eap-aka-sim { # # ### `recv Client-Error { ... }` - Log the fact that the supplicant has terminated authentication # - # The reason for the error should be available in `&Client-Error-Code` + # The reason for the error should be available in `Client-Error-Code` # # After this section is run authentication fails immediately with no # EAP-Response/AKA-Notification round. diff --git a/raddb/sites-available/ldap_sync b/raddb/sites-available/ldap_sync index 62dfe925fc..b92a43fdb0 100644 --- a/raddb/sites-available/ldap_sync +++ b/raddb/sites-available/ldap_sync @@ -255,7 +255,7 @@ server ldap_sync { # FreeRADIUS attributes. # # update { -# &member += "member" +# member += "member" # } # } @@ -330,7 +330,7 @@ server ldap_sync { # update { # Proto.radius.User-Name = 'sAMAccountName' # user-acct-control = 'userAccountControl' -# &last-known-parent = 'lastKnownParent' +# last-known-parent = 'lastKnownParent' # } # } } @@ -383,7 +383,7 @@ server ldap_sync { # if (!reply.LDAP-Sync.Cookie) { # string csn # -# &csn := %concat(%ldap("ldap:///%ldap.uri.safe(%{LDAP-Sync.Directory-Root-DN})?contextCSN?base"), ';') +# csn := %concat(%ldap("ldap:///%ldap.uri.safe(%{LDAP-Sync.Directory-Root-DN})?contextCSN?base"), ';') # reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}" # } } @@ -429,7 +429,7 @@ server ldap_sync { # - request.LDAP-Sync.DN the base_dn of the sync. # - request.LDAP-Sync.Entry-UUID the UUID of the object. (RFC 4533 directories only) # - request.LDAP-Sync.Entry-DN the DN of the object that was added. - # - &*:* attributes mapped from the LDAP entry to FreeRADIUS + # - *:* attributes mapped from the LDAP entry to FreeRADIUS # attributes using the update section within the sync. # - request.LDAP-Sync.Filter the filter of the sync (optional). # - request.LDAP-Sync.Scope the scope of the sync (optional). @@ -456,7 +456,7 @@ server ldap_sync { # - request.LDAP-Sync.DN the base_dn of the sync. # - request.LDAP-Sync.Entry-UUID the UUID of the object. (RFC 4533 directories only) # - request.LDAP-Sync.Entry-DN the DN of the object that was added. - # - &*:* attributes mapped from the LDAP entry to FreeRADIUS + # - *:* attributes mapped from the LDAP entry to FreeRADIUS # attributes using the update section within the sync. # - request.LDAP-Sync.Filter the filter of the sync (optional). # - request.LDAP-Sync.Scope the scope of the sync (optional). @@ -483,7 +483,7 @@ server ldap_sync { # - request.LDAP-Sync.DN the base_dn of the sync. # - request.LDAP-Sync.Entry-UUID the UUID of the object. (RFC 4533 directories only) # - request.LDAP-Sync.Entry-DN the DN of the object that was removed (optional). - # - &*:* attributes mapped from the LDAP entry to FreeRADIUS + # - *:* attributes mapped from the LDAP entry to FreeRADIUS # attributes using the update section within the sync, # if the attributes are returned by the directory. # - request.LDAP-Sync.Filter the filter of the sync (optional). diff --git a/raddb/sites-available/originate-coa b/raddb/sites-available/originate-coa index 0ce7299d46..9c0110d61c 100644 --- a/raddb/sites-available/originate-coa +++ b/raddb/sites-available/originate-coa @@ -33,7 +33,7 @@ # subrequest Disconnect-Request { # User-Name = parent.request.User-Name # Acct-Session-Id = parent.request.Acct-Session-Id -# &NAS-IP-Address = parent.NAS-IP-Address} +# NAS-IP-Address = parent.NAS-IP-Address} # ... # } # diff --git a/raddb/sites-available/vmps b/raddb/sites-available/vmps index fc92ce15d2..d34bf94c8d 100644 --- a/raddb/sites-available/vmps +++ b/raddb/sites-available/vmps @@ -74,7 +74,7 @@ server vmps { request.MAC-Address = "%{1}:%{2}:%{3}:%{4}:%{5}:%{6}" } else { - request.MAC-Address = &Cookie + request.MAC-Address = Cookie } } @@ -91,7 +91,7 @@ server vmps { # reply.Packet-Type = Join-Response reply.Error-Code = No-Error - reply.Cookie = &MAC-Address + reply.Cookie = MAC-Address reply.VLAN-Name = "please_use_real_vlan_here" -- 2.47.3