From: Danny Mayer <mayer@ntp.org>
Date: Sat, 20 May 2006 23:15:50 +0000 (-0400)
Subject: Fix Bug #612: Erroneous FAR macro
X-Git-Tag: NTP_4_2_1P253_RC~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=711671a235feb5be4f9b30a14bcc54690a3148c9;p=thirdparty%2Fntp.git

Fix Bug #612: Erroneous FAR macro

bk: 446fa3261eHpkZAtXDWORXwECo8ojw
---

diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index f2520a7eb..e63781cb2 100644
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -74,9 +74,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifndef SYS_WINNT
-#include <netdb.h>
-#endif
 #include "ntp_rfc2553.h"
 
 #include "ntpd.h"
@@ -109,7 +106,7 @@ static char *ai_errlist[] = {
  */
 int
 DNSlookup_name(
-	const char FAR *name,
+	const char *name,
 	int ai_family,
 	struct hostent **Addresses
 );
@@ -120,7 +117,7 @@ DNSlookup_name(
  */
 int
 DNSlookup_name(
-	const char FAR *name,
+	const char *name,
 	int ai_family,
 	struct hostent **Addresses
 )
diff --git a/ports/winnt/libntp/dnslookup.c b/ports/winnt/libntp/dnslookup.c
index 827b00706..b304b775e 100644
--- a/ports/winnt/libntp/dnslookup.c
+++ b/ports/winnt/libntp/dnslookup.c
@@ -53,7 +53,7 @@ int ReturnCode(int errcode)
 	case 0:
 		return (0);
 	case WSAEINVAL:
-		return (EAI_BADHINTS);
+		return (EAI_BADFLAGS);
 	case WSANO_DATA:
 		return (EAI_NONAME);
 	case WSANOTINITIALISED:
@@ -62,7 +62,7 @@ int ReturnCode(int errcode)
 	case WSA_NOT_ENOUGH_MEMORY:
 		return (EAI_MEMORY);
 	default:
-		return (EAI_SYSTEM);
+		return (EAI_FAIL);
 	}
 }
 
@@ -98,7 +98,7 @@ AddToAddresses(char **Addresses, int *cnt, CSADDR_INFO *csaddr)
 
 int
 DNSlookup_name(
-	const char FAR *name,
+	const char *name,
 	int ai_family,
 	struct hostent **Addresses
 )