From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 15 Mar 2011 08:34:54 +0000 (+0100)
Subject: Note bad configuration
X-Git-Tag: release_2_1_11~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a31c784bc3ee52179c446dc57aaf89df6533c42;p=thirdparty%2Ffreeradius-server.git

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 71c0eba658d..c9501693070 100644
--- 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 e6a75e69e01..6e49b9fd3d7 100644
--- 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;