Make dynamic-resolve scripts in tools/ sort numerically.

Spotted by Paul Dekkers.  Closes RADSECPROXY-39.

diff --git a/AUTHORS b/AUTHORS
index 422c978..4a7323f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Kolbjørn Barmen
 Linus Nordberg
 Maja Wolniewicz
 Milan Sova
+Paul Dekkers
 Paweł Gołaszewski
 Ralf Paffrath
 Simon Leinen

diff --git a/ChangeLog b/ChangeLog
index ed858cb..7b38d95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@
        - Stop the autoconfery from warning about defining variables
        conditionally and unconditionally.
        - Honour configure option --sysconfdir.  (RADSECPROXY-31)
-       - Other bugs.  (RADSECPROXY-26, -28, -34, -35)
+       - Other bugs.  (RADSECPROXY-26, -28, -34, -35, -39)
 
 2011-10-08 1.5
        New features:

diff --git a/tools/naptr-eduroam.sh b/tools/naptr-eduroam.sh
index be722c9..936948c 100755 (executable)
--- a/tools/naptr-eduroam.sh
+++ b/tools/naptr-eduroam.sh
@@ -19,7 +19,7 @@ DIGCMD=$(command -v dig)
 HOSTCMD=$(command -v host)
 
 dig_it_srv() {
-    ${DIGCMD} +short srv $SRV_HOST | sort -k1 |
+    ${DIGCMD} +short srv $SRV_HOST | sort -n -k1 |
     while read line; do
        set $line ; PORT=$3 ; HOST=$4
        /bin/echo -e "\thost ${HOST%.}:${PORT}"
@@ -27,7 +27,7 @@ dig_it_srv() {
 }
 
 dig_it_naptr() {
-    ${DIGCMD} +short naptr ${REALM} | grep x-eduroam:radius.tls | sort -k1 |
+    ${DIGCMD} +short naptr ${REALM} | grep x-eduroam:radius.tls | sort -n -k1 |
     while read line; do
        set $line ; TYPE=$3 ; HOST=$6
        if [ "$TYPE" = "\"s\"" ]; then
@@ -38,7 +38,7 @@ dig_it_naptr() {
 }
 
 host_it_srv() {
-    ${HOSTCMD} -t srv $SRV_HOST | sort -k5 | 
+    ${HOSTCMD} -t srv $SRV_HOST | sort -n -k5 |
     while read line; do
        set $line ; PORT=$7 ; HOST=$8 
        /bin/echo -e "\thost ${HOST%.}:${PORT}"
@@ -46,7 +46,7 @@ host_it_srv() {
 }
 
 host_it_naptr() {
-    ${HOSTCMD} -t naptr ${REALM} | grep x-eduroam:radius.tls | sort -k5 | 
+    ${HOSTCMD} -t naptr ${REALM} | grep x-eduroam:radius.tls | sort -n -k5 |
     while read line; do
        set $line ; TYPE=$7 ; HOST=${10}
        if [ "$TYPE" = "\"s\"" ]; then

diff --git a/tools/radsec-dynsrv.sh b/tools/radsec-dynsrv.sh
index 7a74b6d..c3c5c61 100755 (executable)
--- a/tools/radsec-dynsrv.sh
+++ b/tools/radsec-dynsrv.sh
@@ -19,7 +19,7 @@ DIGCMD=$(command -v digaaa)
 HOSTCMD=$(command -v host)
 
 dig_it() {
-   ${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -k1 |
+   ${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -n -k1 |
    while read line ; do
       set $line ; PORT=$3 ; HOST=$4 
       echo -e "\thost ${HOST%.}:${PORT}"
@@ -27,7 +27,7 @@ dig_it() {
 }
 
 host_it() {
-   ${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -k5 | 
+   ${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -n -k5 |
    while read line ; do
       set $line ; PORT=$7 ; HOST=$8 
       echo -e "\thost ${HOST%.}:${PORT}"