Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2420/

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p14

bk: 5d1c6f34tgnKyKZihE3COjs5phhTog

diff --cc ChangeLog
index 83a6c0fe98e52bbe0986b748526997eb20c76930,91fff56e4f2f43026cd6d606afc4a8af5e02966b..b3f2568fb7cd746c291d17c1741b4a1afda717f1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
  ---
++
+ * [Bug 2420] ntpd doesn't run and exits with retval 0 when invalid user
+              is specified with -u <perlinger@ntp.org>
+   - monitor daemon child startup & propagate exit codes
 +* [Bug 1433] runtime check whether the kernel really supports capabilities
 +  - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntpd.c
Simple merge