From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 14 Jul 2015 00:51:39 +0000 (-0400)
Subject: We can use "lineno" instead of "order"
X-Git-Tag: release_3_0_10~345
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d3673c3168b3b95542c5e82d00c4504e644b7e;p=thirdparty%2Ffreeradius-server.git

We can use "lineno" instead of "order"
---

diff --git a/src/include/tmpl.h b/src/include/tmpl.h
index bf3e429feb8..4392cd12064 100644
--- 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 ff80e22a805..61275873b0a 100644
--- 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;