ntpdate behavior changes between 4.x, 5.x and CURRENT

[Andre Guibert de Bruet]

On Fri, 18 Feb 2005, Doug White wrote:

> On Fri, 18 Feb 2005, Andre Guibert de Bruet wrote:
>
>>> ntpd 4.2.0 + patch to suppress those messages, which was obtained from the
>>> upstream code.
>>>
>>> So the answer is "Because the vendor put it there, and we hid it again in
>>> -CURRENT."
>>
>> Are there any plans to MFC ntpd 4.2.0? If adapting the patch for RELENG_5
>> (And 4.1.1a) would make the process any easier, could I get my mittens on
>> it?
>
> Merging is probably not doable due to interface changes in the library,
> but you can certainly figure out how to adapt the patch.  You'll want to
> coordinate with roberto@ on any changes since he's done the upstream
> imports.

How about something as simple as the attached patch?

| Andre Guibert de Bruet | Enterprise Software Consultant >
| Silicon Landmark, LLC. | http://siliconlandmark.com/    >
-------------- next part --------------
--- ntpdate.c.old	Tue Jul 20 11:01:41 2004
+++ ntpdate.c	Fri Feb 18 15:59:13 2005
@@ -1339,7 +1339,9 @@
         hints.ai_family = ai_fam_templ;
         hints.ai_socktype = SOCK_DGRAM;
 
+	/*
         printf("Looking for host %s and service %s\n", serv, service);
+	*/
 
         error = getaddrinfo(serv, service, &hints, &addrResult);
         if (error != 0) {
@@ -1348,8 +1350,10 @@
 		return;
 	}
         else {
-                fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr));
-        }
+                /*
+		fprintf(stderr, "host found : %s\n", stohost((struct sockaddr_storage*)addrResult->ai_addr));
+        	*/
+	}
 
 	server = (struct server *)emalloc(sizeof(struct server));
 	memset((char *)server, 0, sizeof(struct server));