From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 7 Apr 2018 11:36:59 +0000 (+0200)
Subject: Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf18d755a90cc7f078b106592d176a5b550b9289;p=thirdparty%2Fntp.git

Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3432

bk: 5ac8ad5bh4XmYlI5bB8KFgu4JbrhPw
---

cf18d755a90cc7f078b106592d176a5b550b9289
diff --cc ChangeLog
index 43e769d1f,28b44f2ee..5393c48f3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,8 @@@
  ---
 -
 +* [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
 +  - plus some more work on warnings for unchecked results
+ * [Bug 2821] minor build issues <perlinger@ntp.org>
+  - applied patches by Christos Zoulas, including real bug fixes
  
  ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>
diff --cc ntpd/refclock_true.c
index 1324f7b51,35901392d..185e8b2b7
--- a/ntpd/refclock_true.c
+++ b/ntpd/refclock_true.c
@@@ -634,7 -640,7 +634,7 @@@ true_send
  		size_t len = strlen(cmd);
  
  		true_debug(peer, "Send '%s'\n", cmd);
- 		if (refclock_write(peer, cmd, len, NULL) != len)
 -		if (write(pp->io.fd, cmd, len) != (ssize_t)len)
++		if (refclock_write(peer, cmd, len, NULL) != (ssize_t)len)
  			refclock_report(peer, CEVNT_FAULT);
  		else
  			pp->polls++;