Use AF_UNSPEC not PF_UNSPEC in getaddrinfo calls.

tglsfdc · tglsfdc · commit 9ad94ba08491 · 2014-04-16T13:21:35.000-04:00
According to the Single Unix Spec and assorted man pages, you're supposed
to use the constants named AF_xxx when setting ai_family for a getaddrinfo
call.  In a few places we were using PF_xxx instead.  Use of PF_xxx
appears to be an ancient BSD convention that was not adopted by later
standardization.  On BSD and most later Unixen, it doesn't matter much
because those constants have equivalent values anyway; but nonetheless
this code is not per spec.

In the same vein, replace PF_INET by AF_INET in one socket() call, which
wasn't even consistent with the other socket() call in the same function
let alone the remainder of our code.

Per investigation of a Cygwin trouble report from Marco Atzeri.  It's
probably a long shot that this will fix his issue, but it's wrong in
any case.
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -971,7 +971,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 
 			/* Get the IP address either way */
 			hints.ai_flags = AI_NUMERICHOST;
-			hints.ai_family = PF_UNSPEC;
+			hints.ai_family = AF_UNSPEC;
 			hints.ai_socktype = 0;
 			hints.ai_protocol = 0;
 			hints.ai_addrlen = 0;
diff --git a/src/backend/port/pipe.c b/src/backend/port/pipe.c
@@ -55,7 +55,7 @@ pgpipe(int handles[2])
 		closesocket(s);
 		return -1;
 	}
-	if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
+	if ((handles[1] = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
 	{
 		ereport(LOG, (errmsg_internal("pgpipe could not create socket 2: %ui", WSAGetLastError())));
 		closesocket(s);
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
@@ -316,7 +316,7 @@ pgstat_init(void)
 	 * Create the UDP socket for sending and receiving statistic messages
 	 */
 	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = PF_UNSPEC;
+	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = 0;
 	hints.ai_addrlen = 0;
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -1053,7 +1053,7 @@ setup_config(void)
 
 		/* for best results, this code should match parse_hba() */
 		hints.ai_flags = AI_NUMERICHOST;
-		hints.ai_family = PF_UNSPEC;
+		hints.ai_family = AF_UNSPEC;
 		hints.ai_socktype = 0;
 		hints.ai_protocol = 0;
 		hints.ai_addrlen = 0;

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ pgpipe(int handles[2])`
`55`	`55`	`closesocket(s);`
`56`	`56`	`return -1;`
`57`	`57`	`}`
`58`		`- if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)`
	`58`	`+ if ((handles[1] = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)`
`59`	`59`	`{`
`60`	`60`	`ereport(LOG, (errmsg_internal("pgpipe could not create socket 2: %ui", WSAGetLastError())));`
`61`	`61`	`closesocket(s);`