]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Remove default cistron compatibility.
authorAlan T. DeKok <aland@freeradius.org>
Tue, 14 Jul 2015 00:09:54 +0000 (20:09 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 14 Jul 2015 01:12:31 +0000 (21:12 -0400)
src/modules/rlm_files/rlm_files.c

index 8cfe9cc24e9c5429c415afb94f0df0eadb88ccdb..ff80e22a8057e67cc2e134970a5ca85d89b07292 100644 (file)
@@ -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;
                }