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

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

bk: 42f703983qE8gjztitSRdodBQee-mg

diff --cc configure.ac
Simple merge

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntpd.c
index 5da62ccc98fe3ca20a9cd19b53ce992217b7e4e2,ac92df92b2a46b737cf77ea887a395550d270838..ea5c8260db834d032b604557f1ac3e1b264ca368
--- 1/ntpd/ntpd.c
--- 2/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@@ -557,14 -464,12 +557,14 @@@ printf("1: argc=%d\n", argc)
         * Initialize random generator and public key pair
         */
        get_systime(&now);
-       SRANDOM((int)(now.l_i * now.l_uf));
 +
+       ntp_srandom((int)(now.l_i * now.l_uf));
  
  #ifdef HAVE_DNSREGISTRATION
 -      msyslog(LOG_INFO, "Attemping to register mDNS\n");
 +      /* HMS: does this have to happen this early? */
 +      msyslog(LOG_INFO, "Attemping to register mDNS");
        if ( DNSServiceRegister (&mdns, 0, 0, NULL, "_ntp._udp", NULL, NULL, htons(NTP_PORT), 0, NULL, NULL, NULL) != kDNSServiceErr_NoError ) {
 -              msyslog(LOG_ERR, "Unable to register mDNS\n");
 +              msyslog(LOG_ERR, "Unable to register mDNS");
        }
  #endif
  

diff --cc ntpd/ntpsim.c
Simple merge