Commit 7758dd38 authored by Linus Nordberg's avatar Linus Nordberg

Make dynamic-resolve scripts in tools/ sort numerically.

Spotted by Paul Dekkers.  Closes RADSECPROXY-39.
parent dbcc9977
...@@ -13,6 +13,7 @@ Kolbjørn Barmen ...@@ -13,6 +13,7 @@ Kolbjørn Barmen
Linus Nordberg Linus Nordberg
Maja Wolniewicz Maja Wolniewicz
Milan Sova Milan Sova
Paul Dekkers
Paweł Gołaszewski Paweł Gołaszewski
Ralf Paffrath Ralf Paffrath
Simon Leinen Simon Leinen
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- Stop the autoconfery from warning about defining variables - Stop the autoconfery from warning about defining variables
conditionally and unconditionally. conditionally and unconditionally.
- Honour configure option --sysconfdir. (RADSECPROXY-31) - 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 2011-10-08 1.5
New features: New features:
......
...@@ -19,7 +19,7 @@ DIGCMD=$(command -v dig) ...@@ -19,7 +19,7 @@ DIGCMD=$(command -v dig)
HOSTCMD=$(command -v host) HOSTCMD=$(command -v host)
dig_it_srv() { dig_it_srv() {
${DIGCMD} +short srv $SRV_HOST | sort -k1 | ${DIGCMD} +short srv $SRV_HOST | sort -n -k1 |
while read line; do while read line; do
set $line ; PORT=$3 ; HOST=$4 set $line ; PORT=$3 ; HOST=$4
/bin/echo -e "\thost ${HOST%.}:${PORT}" /bin/echo -e "\thost ${HOST%.}:${PORT}"
...@@ -27,7 +27,7 @@ dig_it_srv() { ...@@ -27,7 +27,7 @@ dig_it_srv() {
} }
dig_it_naptr() { 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 while read line; do
set $line ; TYPE=$3 ; HOST=$6 set $line ; TYPE=$3 ; HOST=$6
if [ "$TYPE" = "\"s\"" ]; then if [ "$TYPE" = "\"s\"" ]; then
...@@ -38,7 +38,7 @@ dig_it_naptr() { ...@@ -38,7 +38,7 @@ dig_it_naptr() {
} }
host_it_srv() { host_it_srv() {
${HOSTCMD} -t srv $SRV_HOST | sort -k5 | ${HOSTCMD} -t srv $SRV_HOST | sort -n -k5 |
while read line; do while read line; do
set $line ; PORT=$7 ; HOST=$8 set $line ; PORT=$7 ; HOST=$8
/bin/echo -e "\thost ${HOST%.}:${PORT}" /bin/echo -e "\thost ${HOST%.}:${PORT}"
...@@ -46,7 +46,7 @@ host_it_srv() { ...@@ -46,7 +46,7 @@ host_it_srv() {
} }
host_it_naptr() { 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 while read line; do
set $line ; TYPE=$7 ; HOST=${10} set $line ; TYPE=$7 ; HOST=${10}
if [ "$TYPE" = "\"s\"" ]; then if [ "$TYPE" = "\"s\"" ]; then
......
...@@ -19,7 +19,7 @@ DIGCMD=$(command -v digaaa) ...@@ -19,7 +19,7 @@ DIGCMD=$(command -v digaaa)
HOSTCMD=$(command -v host) HOSTCMD=$(command -v host)
dig_it() { dig_it() {
${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -k1 | ${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -n -k1 |
while read line ; do while read line ; do
set $line ; PORT=$3 ; HOST=$4 set $line ; PORT=$3 ; HOST=$4
echo -e "\thost ${HOST%.}:${PORT}" echo -e "\thost ${HOST%.}:${PORT}"
...@@ -27,7 +27,7 @@ dig_it() { ...@@ -27,7 +27,7 @@ dig_it() {
} }
host_it() { host_it() {
${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -k5 | ${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -n -k5 |
while read line ; do while read line ; do
set $line ; PORT=$7 ; HOST=$8 set $line ; PORT=$7 ; HOST=$8
echo -e "\thost ${HOST%.}:${PORT}" echo -e "\thost ${HOST%.}:${PORT}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment