From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 14 Jul 2015 00:09:54 +0000 (-0400)
Subject: Remove default cistron compatibility.
X-Git-Tag: release_3_0_10~347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc430488cdf1d28ca00c44d93185e1ca34b8e85;p=thirdparty%2Ffreeradius-server.git

Remove default cistron compatibility.
---

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 8cfe9cc24e9..ff80e22a805 100644
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -88,7 +88,7 @@ static const CONF_PARSER module_config[] = {
 #endif
 	{ "auth_usersfile", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT, rlm_files_t, auth_usersfile), NULL },
 	{ "postauth_usersfile", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT, rlm_files_t, postauth_usersfile), NULL },
-	{ "compat", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_files_t, compat_mode), "cistron" },
+	{ "compat", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_DEPRECATED, rlm_files_t, compat_mode), NULL },
 	{ "key", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_XLAT, rlm_files_t, key), NULL },
 	{ NULL, -1, 0, NULL, NULL }
 };
@@ -136,11 +136,11 @@ static int getusersfile(TALLOC_CTX *ctx, char const *filename, fr_hash_table_t *
 	 *	or if we're in compat_mode.
 	 */
 	if ((rad_debug_lvl) ||
-	    (strcmp(compat_mode_str, "cistron") == 0)) {
+	    (compat_mode_str && (strcmp(compat_mode_str, "cistron") == 0))) {
 		VALUE_PAIR *vp;
 		bool compat_mode = false;
 
-		if (strcmp(compat_mode_str, "cistron") == 0) {
+		if (compat_mode_str && (strcmp(compat_mode_str, "cistron") == 0)) {
 			compat_mode = true;
 		}