Avoid use of moonshot in attribute names

diff --git a/raddb/policy.d/abfab-tr b/raddb/policy.d/abfab-tr
index 48e45c0..4f83745 100644 (file)
--- a/raddb/policy.d/abfab-tr
+++ b/raddb/policy.d/abfab-tr
@@ -4,7 +4,7 @@
 psk_authorize {
        if (tls-psk-identity =* ANY) {
                # TODO: may need to check moonshot-apc as well
-               if ("%{psksql:select distinct keyid from authorizations_keys where keyid = '%{tls-psk-identity}' and '%{moonshot-coi}' like coi and '%{gss-acceptor-realm-name}' like acceptor_realm and '%{gss-acceptor-host-name}' like hostname;}") {
+               if ("%{psksql:select distinct keyid from authorizations_keys where keyid = '%{tls-psk-identity}' and '%{trust-router-coi}' like coi and '%{gss-acceptor-realm-name}' like acceptor_realm and '%{gss-acceptor-host-name}' like hostname;}") {
                }
                else {
                        reject
@@ -19,10 +19,10 @@ abfab_pre_proxy {
                        reject
                }
        }
-       # set moonshot-coi attribute from client configuration
-       if ("%{client:moonshot_coi}") {
+       # set trust-router-coi attribute from client configuration
+       if ("%{client:trust_router_coi}") {
                update request {
-                       moonshot-coi := "%{client:moonshot_coi}"
+                       trust-router-coi := "%{client:trust_router_coi}"
                }
        }
        # set gss-acceptor-realm-name attribute from client configuration

diff --git a/share/dictionary.ukerna b/share/dictionary.ukerna
index 8f2c994..aabb86c 100644 (file)
--- a/share/dictionary.ukerna
+++ b/share/dictionary.ukerna
@@ -16,7 +16,7 @@ ATTRIBUTE     UKERNA-GSS-Acceptor-Service-Specific    130     string
 ATTRIBUTE      UKERNA-GSS-Acceptor-Realm-Name          131     string
 ATTRIBUTE      SAML-AAA-Assertion              132     string
 ATTRIBUTE      EAP-Channel-Binding-Message     135     octets
-ATTRIBUTE      Moonshot-COI    136     string
-ATTRIBUTE      Moonshot-APC    137     string
+ATTRIBUTE      Trust-Router-COI        136     string
+ATTRIBUTE      Trust-Router-APC        137     string
 
 END-VENDOR UKERNA