clean up last bits of "&" manually

alandekok · alandekok · commit 05b93e176889 · 2025-01-31T07:12:22.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ send Up {`
`232`	`232`	`# Sneak in more data after a BFD packet!`
`233`	`233`	`#`
`234`	`234`	`# reply.Additional-Data := {`
`235`		`-# &more-data := 0xabcdef`
	`235`	`+# more-data := 0xabcdef`
`236`	`236`	`# }`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ recv Request {`
`186`	`186`	`control.Server-Identifier = 192.0.2.1`
`187`	`187`
`188`	`188`	`# If the request is not for this server then silently discard it`
`189`		`- if (request.Server-Identifier && \`
	`189`	`+ if (request.Server-Identifier &&`
`190`	`190`	`request.Server-Identifier != control.Server-Identifier) {`
`191`	`191`	`do_not_respond`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# It's meant to be a _flexible_ DNS server. Want to give different answers to VoIP phones`
`21`	`21`	`# and desktops, or other types of split horizon? It can do that.`
`22`	`22`	`#`
`23`		`-# Because DNS uses the &Header.Rcode to communicate the result of a query (instead of opcode)`
	`23`	`+# Because DNS uses the Header.Rcode to communicate the result of a query (instead of opcode)`
`24`	`24`	`# the DNS state machine works differently to other protocols.`
`25`	`25`	`#`
`26`	`26`	`# Requests will pass through the following processing sections:`
`@@ -61,11 +61,11 @@ server dns {`
`61`	`61`	`recv Query {`
`62`	`62`	`if (Question[0].Name == 'foo.example.com') {`
`63`	`63`	`reply.Resource-Record := {`
`64`		`- &Name = 'foo.example.com'`
`65`		`- &Type = A`
`66`		`- &Class = ::Internet`
`67`		`- &TTL = 0`
`68`		`- &Type.A.IP = 127.0.0.1`
	`64`	`+ Name = 'foo.example.com'`
	`65`	`+ Type = ::A`
	`66`	`+ Class = ::Internet`
	`67`	`+ TTL = 0`
	`68`	`+ Type.A.IP = 127.0.0.1`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ server eap-aka-sim {`
`347`	`347`	`# If for whatever reason the identity cannot be validated, you should`
`348`	`348`	# return `notfound` to request an additional identity.
`349`	`349`	`#`
`350`		- # NOTE: Setting `&Method-Hint = Pseudonym` here will cause the server
	`350`	+ # NOTE: Setting `Method-Hint = Pseudonym` here will cause the server
`351`	`351`	# to execute the `load pseudonym { ... }` section next. This is
`352`	`352`	`# sometimes useful when dealing with non-standard pseudonym identities.`
`353`	`353`	`#`
`@@ -362,7 +362,7 @@ server eap-aka-sim {`
`362`	`362`	# If the identity cannot be resolved, you should return `notfound` to
`363`	`363`	`# request an additional identity.`
`364`	`364`	`#`
`365`		- # NOTE: Setting `&Method-Hint = Fastauth` here will cause the server
	`365`	+ # NOTE: Setting `Method-Hint = Fastauth` here will cause the server
`366`	`366`	# to execute the `load session { ... }` section next. This is
`367`	`367`	`# sometimes useful when dealing with non-standard fastauth identities.`
`368`	`368`	`#`
`@@ -677,7 +677,7 @@ server eap-aka-sim {`
`677`	`677`	`#`
`678`	`678`	# ### `recv Client-Error { ... }` - Log the fact that the supplicant has terminated authentication
`679`	`679`	`#`
`680`		- # The reason for the error should be available in `&Client-Error-Code`
	`680`	+ # The reason for the error should be available in `Client-Error-Code`
`681`	`681`	`#`
`682`	`682`	`# After this section is run authentication fails immediately with no`
`683`	`683`	`# EAP-Response/AKA-Notification round.`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`# subrequest Disconnect-Request {`
`34`	`34`	`# User-Name = parent.request.User-Name`
`35`	`35`	`# Acct-Session-Id = parent.request.Acct-Session-Id`
`36`		`-# &NAS-IP-Address = parent.NAS-IP-Address}`
	`36`	`+# NAS-IP-Address = parent.NAS-IP-Address}`
`37`	`37`	`# ...`
`38`	`38`	`# }`
`39`	`39`	`#`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ server vmps {`
`74`	`74`	`request.MAC-Address = "%{1}:%{2}:%{3}:%{4}:%{5}:%{6}"`
`75`	`75`	`}`
`76`	`76`	`else {`
`77`		`- request.MAC-Address = &Cookie`
	`77`	`+ request.MAC-Address = Cookie`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`@@ -91,7 +91,7 @@ server vmps {`
`91`	`91`	`#`
`92`	`92`	`reply.Packet-Type = Join-Response`
`93`	`93`	`reply.Error-Code = No-Error`
`94`		`- reply.Cookie = &MAC-Address`
	`94`	`+ reply.Cookie = MAC-Address`
`95`	`95`
`96`	`96`	`reply.VLAN-Name = "please_use_real_vlan_here"`
`97`	`97`