Note bad configuration

The sqlcounter module does it's own expansion.  This doesn't
seem to work.

diff --git a/raddb/modules/sqlcounter_expire_on_login b/raddb/modules/sqlcounter_expire_on_login
index 71c0eba658d4356120c2febf6a050a7c97d4a86f..c950169307009b088b2c31274f496ffe38e8a793 100644 (file)
--- a/raddb/modules/sqlcounter_expire_on_login
+++ b/raddb/modules/sqlcounter_expire_on_login
@@ -10,6 +10,19 @@
 #
 #  This example is for MySQL.  Other SQL variants should be similar.
 #
+#  For versions prior to 2.1.11, this module defined the following
+#  expansion strings:
+#
+#      %k      key_name
+#      %S      sqlmod_inst
+#
+#  These SHOULD NOT be used.  If these are used in your configuration,
+#  they should be replaced by the following strings, which will work
+#  identically to the previous ones:
+#
+#      %k      ${key}
+#      %S      ${sqlmod-inst}
+#
 sqlcounter expire_on_login {
        counter-name = Expire-After-Initial-Login
        check-name = Expire-After
@@ -18,7 +31,7 @@ sqlcounter expire_on_login {
        reset = never
        query = "SELECT TIME_TO_SEC(TIMEDIFF(NOW(), acctstarttime)) \
                 FROM radacct \
-                WHERE UserName='%{%k}' \
+                WHERE UserName='%{${key}}' \
                 ORDER BY acctstarttime \
                 LIMIT 1;"
 }

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index e6a75e69e01b69cd8ec7e8c9c3413477ef192886..6e49b9fd3d7304cd780db660fc21035b656c8557 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -349,10 +349,12 @@ static int sqlcounter_expand(char *out, int outlen, const char *fmt, void *insta
                                q += strlen(q);
                                break;
                        case 'k': /* Key Name */
+                               DEBUG2("WARNING: Please replace '%%k' with '${key}'")
                                strlcpy(q, data->key_name, freespace);
                                q += strlen(q);
                                break;
                        case 'S': /* SQL module instance */
+                               DEBUG2("WARNING: Please replace '%%S' with '${sqlmod-inst}'")
                                strlcpy(q, data->sqlmod_inst, freespace);
                                q += strlen(q);
                                break;