components/ntp/patches/40-ntpwait.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Thu, 30 Oct 2014 05:32:45 -0700
changeset 2184 32c5cf5b5dc1
parent 1467 f14b6c5766ca
permissions -rw-r--r--
18058896 Need an option for Samba to ignore additional groups

This change allows ntp-wait to work with more versions
of NTP, since the format changed slightly. It can be removed
at the next upgrade since there will be no possibility 
of running an older ntp with the old format.

--- scripts/ntp-wait.in
+++ scripts/ntp-wait.in
@@ -20,8 +20,8 @@
     while(<Q>) {
       chomp;
       # the first line should be similar to:
-      # associd=0 status=0645 leap_none, sync_ntp, ...
-      if (/^asso?c?id=0 status=(\S{4}) (\S+), (\S+),/i) {
+      # status=0645 leap_none, sync_ntp, ...
+      if (/status=(\S{4}) (\S+), (\S+),/i) {
 	my $status = $1;
 	my $leap = $2;
 	my $sync = $3;