Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev

into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 430fd84fnSOTlrJXfVIvfkrSFFmHUw

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntpd.c
index 3df59bda4bc34ab06de2256e73c304dd709bb4cc,b03bbfc0f6476ea6cc60aaa7e27c308586416abe..a16ba2563a5d5183cc44def77d362f13a6faecdf
--- 1/ntpd/ntpd.c
--- 2/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@@ -10,12 -10,10 +10,13 @@@
  #include "ntpd.h"
  #include "ntp_io.h"
  #include "ntp_stdlib.h"
+ #include <ntp_random.h>
  
  #ifdef SIM
 -#include "ntpsim.h"
 +# include "ntpsim.h"
 +# include "ntpdsim-opts.h"
 +#else
 +# include "ntpd-opts.h"
  #endif
  
  #ifdef HAVE_UNISTD_H