From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 8 Aug 2005 07:02:48 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c43325822600557532371a9ea5fd48085146ea79;p=thirdparty%2Fntp.git

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

bk: 42f703983qE8gjztitSRdodBQee-mg
---

c43325822600557532371a9ea5fd48085146ea79
diff --cc ntpd/ntpd.c
index 5da62ccc98,ac92df92b2..ea5c8260db
--- a/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