From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Jun 2011 05:31:27 +0000 (-0700)
Subject: ntp-wait: some versions of ntpd spell "associd" differently
X-Git-Tag: NTP_4_2_7P188~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=debd7d2f915907fc5d8bd0c1acc01939ffc6241f;p=thirdparty%2Fntp.git

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

bk: 4e09672fDcWfaag5qx4EQHkDC9PPlQ
---

diff --git a/ChangeLog b/ChangeLog
index 2bdfcaf98..4424672cf 100644
--- 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 7b026ca19..069365b10 100644
--- 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;