remove '&' from krb5

diff --git a/doc/antora/modules/reference/pages/raddb/mods-available/krb5.adoc b/doc/antora/modules/reference/pages/raddb/mods-available/krb5.adoc
index 40781229e9f2ced9f9db7ee569c44a2592530245..cabfc0ad65539da0939269c05151c6f8a2fea371 100644 (file)
--- a/doc/antora/modules/reference/pages/raddb/mods-available/krb5.adoc
+++ b/doc/antora/modules/reference/pages/raddb/mods-available/krb5.adoc
@@ -81,8 +81,8 @@ krb5
 krb5 {
        keytab = /path/to/keytab
        service_principal = name_of_principle
-#      username = &User-Name
-#      password = &User-Password
+#      username = User-Name
+#      password = User-Password
        reuse {
 #              min = 10
 #              max = 100

diff --git a/raddb/mods-available/krb5 b/raddb/mods-available/krb5
index 3a26c5de66caf08d21487406842081a67d1acafa..b9604ed35536bd701e5485e6b421cca9f260931d 100644 (file)
--- a/raddb/mods-available/krb5
+++ b/raddb/mods-available/krb5
@@ -31,11 +31,11 @@ krb5 {
        #
        #  If this is just a user name, then the default Kerberos realm will
        #  automatically be added.
-#      username = &User-Name
+#      username = User-Name
 
        #
        #  password:: The password to use in user authentication
-#      password = &User-Password
+#      password = User-Password
 
        #
        #  .Reusable Handles

diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 3007de21eba2a53aeceb3a6aba76f00e10712d9c..d1c0dc5534f3418a87752c756084ccbe3b414526 100644 (file)
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -485,10 +485,10 @@ cleanup:
 static const call_env_method_t krb5_auth_call_env = {
        FR_CALL_ENV_METHOD_OUT(krb5_auth_call_env_t),
        .env = (call_env_parser_t[]) {
-               { FR_CALL_ENV_OFFSET("username", FR_TYPE_STRING, CALL_ENV_FLAG_REQUIRED, krb5_auth_call_env_t, username),
-                       .pair.dflt = "&User-Name", .pair.dflt_quote = T_BARE_WORD },
-               { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SECRET | CALL_ENV_FLAG_REQUIRED, krb5_auth_call_env_t, password),
-                       .pair.dflt = "&User-Password", .pair.dflt_quote = T_BARE_WORD },
+               { FR_CALL_ENV_OFFSET("username", FR_TYPE_STRING, CALL_ENV_FLAG_REQUIRED| CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, krb5_auth_call_env_t, username),
+                       .pair.dflt = "User-Name", .pair.dflt_quote = T_BARE_WORD },
+               { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SECRET | CALL_ENV_FLAG_REQUIRED| CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, krb5_auth_call_env_t, password),
+                       .pair.dflt = "User-Password", .pair.dflt_quote = T_BARE_WORD },
                CALL_ENV_TERMINATOR
        }
 };