Changeset 14145 in hybrid for branches/releng-11/nanobsd

Timestamp:

Apr 25, 2018, 10:34:21 PM (7 years ago)

Author:

rick

Message:

Fix creation of duplicated nameserver entries

regex will matches multiple addresses since closing bound was not enforced,
e.g NAMESERVER=172.31.254.1 would also be matched at 172.31.254.10

This bug never surfaced, since all DNS IP addresses used to be fairly
unique/random.

File:

• branches/releng-11/nanobsd/files/tools/nameserver-shuffle (modified) (1 diff)

branches/releng-11/nanobsd/files/tools/nameserver-shuffle

@@ -55 +55 @@
     ML=`awk '/^nameserver/ {l=length($4);if (l>ml){ml=l}}END{print ml}' $DYNLIST`
     # awk magic allows adding or updating of status of nameserver
-    awk '/^nameserver[[:blank:]]+'"$NAMESERVER"'[[:blank:]]*/ {printf "nameserver %-16s # %-'$ML's (%s)\n", $2, $4,"'"$STATUS"'"}' $DYNLIST >> $NEWRESOLV || exit 1
+    awk '/^nameserver[[:blank:]]+'"$NAMESERVER"'[[:blank:]]+/ {printf "nameserver %-16s # %-'$ML's (%s)\n", $2, $4,"'"$STATUS"'"}' $DYNLIST >> $NEWRESOLV || exit 1
   done
   $verbose && echo "################################"