diff options
| author | Bruce Momjian <bruce@momjian.us> | 2014-04-16 10:45:48 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2014-04-16 10:45:48 -0400 |
| commit | 966f015b60d90f6450cbadcbfa89e21408fe52f9 (patch) | |
| tree | 2b1bcc74ac9cfbef514fb19cea89b3cf95a899d7 /src/backend/libpq/auth.c | |
| parent | a4c4e0bf60f0f8dbe2556fabd94eb827ae376032 (diff) | |
| download | postgresql-966f015b60d90f6450cbadcbfa89e21408fe52f9.tar.gz postgresql-966f015b60d90f6450cbadcbfa89e21408fe52f9.zip | |
check socket creation errors against PGINVALID_SOCKET
Previously, in some places, socket creation errors were checked for
negative values, which is not true for Windows because sockets are
unsigned. This masked socket creation errors on Windows.
Backpatch through 9.0. 8.4 doesn't have the infrastructure to fix this.
Diffstat (limited to 'src/backend/libpq/auth.c')
| -rw-r--r-- | src/backend/libpq/auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index c65427e53c4..a85f285e9f7 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -1673,7 +1673,7 @@ ident_inet(hbaPort *port) sock_fd = socket(ident_serv->ai_family, ident_serv->ai_socktype, ident_serv->ai_protocol); - if (sock_fd < 0) + if (sock_fd == PGINVALID_SOCKET) { ereport(LOG, (errcode_for_socket_access(), @@ -1753,7 +1753,7 @@ ident_inet(hbaPort *port) ident_response))); ident_inet_done: - if (sock_fd >= 0) + if (sock_fd != PGINVALID_SOCKET) closesocket(sock_fd); pg_freeaddrinfo_all(remote_addr.addr.ss_family, ident_serv); pg_freeaddrinfo_all(local_addr.addr.ss_family, la); @@ -2576,7 +2576,7 @@ CheckRADIUSAuth(Port *port) packet->length = htons(packet->length); sock = socket(serveraddrs[0].ai_family, SOCK_DGRAM, 0); - if (sock < 0) + if (sock == PGINVALID_SOCKET) { ereport(LOG, (errmsg("could not create RADIUS socket: %m"))); |