We can use "lineno" instead of "order"

diff --git a/src/include/tmpl.h b/src/include/tmpl.h
index bf3e429feb80dc242daf8e6f686b22a1d1f8289f..4392cd12064912ed93affaabda058aaa1ed8c043 100644 (file)
--- a/src/include/tmpl.h
+++ b/src/include/tmpl.h
@@ -122,7 +122,6 @@ typedef struct pair_list {
        VALUE_PAIR              *check;
        VALUE_PAIR              *reply;
        int                     lineno;
-       int                     order;
        struct pair_list        *next;
 } PAIR_LIST;
 

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index ff80e22a8057e67cc2e134970a5ca85d89b07292..61275873b0a974b550b4ef3ea7b5a24111b7e095 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -273,7 +273,6 @@ static int getusersfile(TALLOC_CTX *ctx, char const *filename, fr_hash_table_t *
 
                next = entry->next;
                entry->next = NULL;
-               entry->order = order++;
 
                /*
                 *      Insert it into the hash table, and remember
@@ -408,7 +407,7 @@ static rlm_rcode_t file_common(rlm_files_t *inst, REQUEST *request, char const *
                        match = "DEFAULT";
                        default_pl = default_pl->next;
 
-               } else if (user_pl->order < default_pl->order) {
+               } else if (user_pl->lineno < default_pl->lineno) {
                        pl = user_pl;
                        match = name;
                        user_pl = user_pl->next;