Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 31a469c

Browse files
committed
Use AF_UNSPEC not PF_UNSPEC in getaddrinfo calls.
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.
1 parent cc26927 commit 31a469c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/backend/libpq/hba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ parse_hba_line(List *line, int line_num, char *raw_line)
10411041

10421042
/* Get the IP address either way */
10431043
hints.ai_flags = AI_NUMERICHOST;
1044-
hints.ai_family = PF_UNSPEC;
1044+
hints.ai_family = AF_UNSPEC;
10451045
hints.ai_socktype = 0;
10461046
hints.ai_protocol = 0;
10471047
hints.ai_addrlen = 0;

src/backend/postmaster/pgstat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ pgstat_init(void)
332332
* Create the UDP socket for sending and receiving statistic messages
333333
*/
334334
hints.ai_flags = AI_PASSIVE;
335-
hints.ai_family = PF_UNSPEC;
335+
hints.ai_family = AF_UNSPEC;
336336
hints.ai_socktype = SOCK_DGRAM;
337337
hints.ai_protocol = 0;
338338
hints.ai_addrlen = 0;

src/bin/initdb/initdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ setup_config(void)
13061306

13071307
/* for best results, this code should match parse_hba() */
13081308
hints.ai_flags = AI_NUMERICHOST;
1309-
hints.ai_family = PF_UNSPEC;
1309+
hints.ai_family = AF_UNSPEC;
13101310
hints.ai_socktype = 0;
13111311
hints.ai_protocol = 0;
13121312
hints.ai_addrlen = 0;

src/bin/pg_dump/parallel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ pgpipe(int handles[2])
13601360
closesocket(s);
13611361
return -1;
13621362
}
1363-
if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
1363+
if ((handles[1] = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
13641364
{
13651365
write_msg(modulename, "pgpipe: could not create second socket: error code %d\n",
13661366
WSAGetLastError());

0 commit comments

Comments
 (0)