ntp-wait: some versions of ntpd spell "associd" differently

bk: 4e09672fDcWfaag5qx4EQHkDC9PPlQ

diff --git a/ChangeLog b/ChangeLog
index 2bdfcaf98f711ab9b3908aaa3e5ae2466d92fca8..4424672cf84d57d9ce9c58581d3c4b52e3ea0f50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 1958] genLocInfo must export PATH.
+* ntp-wait: some versions of ntpd spell "associd" differently.
 (4.2.7p187) 2011/06/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1954] Fix typos in [s]bin_PROGRAMS in ntpd/Makefile.am.
 * Implement --with-locfile=filename configure argument.  If filename is

diff --git a/scripts/ntp-wait.in b/scripts/ntp-wait.in
index 7b026ca1909c84458995dd713a898a89fa685955..069365b1091fe6c6fbe341f1bef668d39a330ae1 100644 (file)
--- a/scripts/ntp-wait.in
+++ b/scripts/ntp-wait.in
@@ -21,7 +21,7 @@ for ($i = 0; $i < $opt_n; ++$i) {
       chomp;
       # the first line should be similar to:
       # associd=0 status=0645 leap_none, sync_ntp, ...
-      if (/^associd=0 status=(\S{4}) (\S+), (\S+),/) {
+      if (/^asso?c?id=0 status=(\S{4}) (\S+), (\S+),/i) {
        my $status = $1;
        my $leap = $2;
        my $sync = $3;