From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 29 Apr 2018 12:01:39 +0000 (+1200)
Subject: Better ordering
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd90e2f1f261336b63cd835da34866a1470daef7;p=thirdparty%2Ffreeradius-server.git

Better ordering
---

diff --git a/scripts/autoload_defs.sh b/scripts/autoload_defs.sh
index e6f0a10e3d8..d7a7ecf48f2 100755
--- a/scripts/autoload_defs.sh
+++ b/scripts/autoload_defs.sh
@@ -6,7 +6,7 @@ NEED_RADIUS=false
 
 IFS=$'\n'
 for i in $@; do
-	ATTR_DEFS+=($(grep -o -E 'FR_[[:alnum:]_]*' "$i" | sort | uniq | sed -e 's/^FR_//' | sed -e 's/_/-/g'))
+	ATTR_DEFS+=($(grep -o -E 'FR_[[:alnum:]_]*' "$i" | sort -k 3 | uniq | sed -e 's/^FR_//' | sed -e 's/_/-/g'))
 done
 
 for i in $@; do
@@ -16,7 +16,7 @@ for i in $@; do
 	fi
 done
 
-RESOLVED=($(radict -- ${ATTR_DEFS[*]} | sort -k5,3))
+RESOLVED=($(radict -- ${ATTR_DEFS[*]} | grep -oE ".*\t.*\t.*\t.*\t(internal)?" | sort -s -r -k5 | uniq))
 
 for i in ${RESOLVED[*]}; do
 	if echo $i | cut -f 5 | grep 'internal' > /dev/null; then
@@ -157,6 +157,11 @@ for i in ${RESOLVED[*]}; do
 	'date')
 		TYPE="FR_TYPE_DATE"
 		;;
+
+	'extended')
+		TYPE="FR_TYPE_EXTENDED"
+		;;
+
 	*)
 		TYPE="FR_UNKNOWN"
 		;;