radsecproxy-1.6.5.

[libradsec.git] / tools / naptr-eduroam.sh

diff --git a/tools/naptr-eduroam.sh b/tools/naptr-eduroam.sh
index 5f04704..e310812 100755 (executable)
--- a/tools/naptr-eduroam.sh
+++ b/tools/naptr-eduroam.sh
@@ -1,11 +1,11 @@
-#! /bin/bash
+#! /bin/sh
 
 # Example script!
 # This script looks up radsec srv records in DNS for the one
 # realm given as argument, and creates a server template based
 # on that. It currently ignores weight markers, but does sort
 # servers on priority marker, lowest number first.
-# For host command this is coloumn 5, for dig it is coloumn 1.
+# For host command this is column 5, for dig it is column 1.
 
 usage() {
     echo "Usage: ${0} <realm>"
@@ -17,57 +17,58 @@ test -n "${1}" || usage
 REALM="${1}"
 DIGCMD=$(command -v dig)
 HOSTCMD=$(command -v host)
+PRINTCMD=$(command -v printf)
 
 dig_it_srv() {
-    ${DIGCMD} +short srv $SRV_HOST | sort -k1 |
-    while read line ; do
+    ${DIGCMD} +short srv $SRV_HOST | sort -n -k1 |
+    while read line; do
        set $line ; PORT=$3 ; HOST=$4
-       echo -e "\thost ${HOST%.}:${PORT}"
+       $PRINTCMD "\thost ${HOST%.}:${PORT}\n"
     done
 }
 
 dig_it_naptr() {
-    ${DIGCMD} +short naptr ${REALM} | grep x-eduroam:radius.tls | sort -k1 |
-    while read line ; do
+    ${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 { 
-               SRV_HOST=${HOST%.}
-               dig_it_srv; };
+       if [ "$TYPE" = "\"s\"" -o "$TYPE" = "\"S\"" ]; then
+           SRV_HOST=${HOST%.}
+           dig_it_srv
        fi
     done
 }
 
 host_it_srv() {
-    ${HOSTCMD} -t srv $SRV_HOST | sort -k5 | 
-    while read line ; do
+    ${HOSTCMD} -t srv $SRV_HOST | sort -n -k5 |
+    while read line; do
        set $line ; PORT=$7 ; HOST=$8 
-       echo -e "\thost ${HOST%.}:${PORT}"
+       $PRINTCMD "\thost ${HOST%.}:${PORT}\n"
     done
 }
 
 host_it_naptr() {
-    ${HOSTCMD} -t naptr ${REALM} | grep x-eduroam:radius.tls | sort -k5 | 
-    while read line ; do
+    ${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 {
-               SRV_HOST=${HOST%.}
-               host_it_srv; }; fi
-       
+       if [ "$TYPE" = "\"s\"" -o "$TYPE" = "\"S\"" ]; then
+           SRV_HOST=${HOST%.}
+           host_it_srv
+       fi
     done
 }
 
-if test -x "${DIGCMD}" ; then
+if [ -x "${DIGCMD}" ]; then
     SERVERS=$(dig_it_naptr)
-elif test -x "${HOSTCMD}" ; then
+elif [ -x "${HOSTCMD}" ]; then
     SERVERS=$(host_it_naptr)
 else
     echo "${0} requires either \"dig\" or \"host\" command."
     exit 1
 fi
 
-if test -n "${SERVERS}" ; then
-    echo -e "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}"
+if [ -n "${SERVERS}" ]; then
+    $PRINTCMD "server dynamic_radsec.${REALM} {\n${SERVERS}\n\ttype TLS\n}\n"
     exit 0
 fi
 
-exit 0
+exit 10                                # No server found.