Use "long names" for config vars, rather than abbreviated names.

diff --git a/raddb/x99.conf b/raddb/x99.conf
index a030d96..0460f12 100644 (file)
--- a/raddb/x99.conf
+++ b/raddb/x99.conf
@@ -43,11 +43,11 @@ x99_token {
        # disallowed, except that you MUST have a single "%s"
        # sequence in the string; the challenge itself is
        # inserted there.  (default "Challenge: %s\n Response: ")
-       #chal_text = "Challenge: %s\n Response: "
+       #challenge_text = "Challenge: %s\n Response: "
 
        # Length of the challenge.  Most tokens probably support a
        # max of 8 digits.  (range: 5-32 digits, default 6)
-       #chal_len = 6
+       #challenge_length = 6
 
        # Maximum time, in seconds, that a challenge is valid.
        # (The user must respond to a challenge within this time.)

diff --git a/src/modules/rlm_x99_token/x99_rlm.c b/src/modules/rlm_x99_token/x99_rlm.c
index 9ac269c..d754426 100644 (file)
--- a/src/modules/rlm_x99_token/x99_rlm.c
+++ b/src/modules/rlm_x99_token/x99_rlm.c
@@ -82,9 +82,9 @@ static CONF_PARSER module_config[] = {
       NULL, "/etc/x99passwd" },
     { "syncdir", PW_TYPE_STRING_PTR, offsetof(x99_token_t, syncdir),
       NULL, "/etc/x99sync.d" },
-    { "chal_text", PW_TYPE_STRING_PTR, offsetof(x99_token_t, chal_text),
+    { "challenge_text", PW_TYPE_STRING_PTR, offsetof(x99_token_t, chal_text),
       NULL, CHALLENGE_TEXT },
-    { "chal_len", PW_TYPE_INTEGER, offsetof(x99_token_t, chal_len),
+    { "challenge_length", PW_TYPE_INTEGER, offsetof(x99_token_t, chal_len),
       NULL, "6" },
     { "maxdelay", PW_TYPE_INTEGER, offsetof(x99_token_t, maxdelay),
       NULL, "30" },