]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable
authorJuergen Perlinger <perlinger@ntp.org>
Sat, 7 Apr 2018 11:36:59 +0000 (13:36 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Sat, 7 Apr 2018 11:36:59 +0000 (13:36 +0200)
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3432

bk: 5ac8ad5bh4XmYlI5bB8KFgu4JbrhPw

1  2 
ChangeLog
ntpd/refclock_gpsdjson.c
ntpd/refclock_true.c

diff --cc ChangeLog
index 43e769d1f53eca8ad192d8fd80aeefe7eacca9b9,28b44f2eea403bd0a3bd060e30b5fe994bd8d472..5393c48f3e048c5acf430cef009a368c44f9210a
+++ 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>
Simple merge
index 1324f7b51cbcbce7ac7453feacefe4f9df16ed40,35901392da0e420ba572fd283a24588b57556fd3..185e8b2b7f7361aeb518c8fb5dc0df7e4b867064
@@@ -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++;