diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-06-12 07:36:51 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-06-12 07:36:51 +0000 |
| commit | b4cea00a1fc9d2270bfe9aeeee44915378d5f733 (patch) | |
| tree | 16a6702b864f8e8795a498c4e2bf5f91fee54862 /src/backend/libpq/auth.c | |
| parent | e5549a272d922c5d9ed177a823914fdee6ada08d (diff) | |
| download | postgresql-b4cea00a1fc9d2270bfe9aeeee44915378d5f733.tar.gz | |
IPv6 cleanups.
Kurt Roeckx
Andrew Dunstan
Diffstat (limited to 'src/backend/libpq/auth.c')
| -rw-r--r-- | src/backend/libpq/auth.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 2b0d2d65a8..46965e3bcb 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.101 2003/04/25 03:28:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.102 2003/06/12 07:36:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -415,15 +415,13 @@ ClientAuthentication(Port *port) * out the less clueful good guys. */ { - const char *hostinfo = "localhost"; -#ifdef HAVE_IPV6 - char ip_hostinfo[INET6_ADDRSTRLEN]; -#else - char ip_hostinfo[INET_ADDRSTRLEN]; -#endif - if (isAF_INETx(port->raddr.sa.sa_family) ) - hostinfo = SockAddr_ntop(&port->raddr, ip_hostinfo, - sizeof(ip_hostinfo), 1); + char hostinfo[NI_MAXHOST]; + + getnameinfo( + (struct sockaddr *)&port->raddr.addr, + port->raddr.salen, + hostinfo, sizeof(hostinfo), + NULL, 0, NI_NUMERICHOST); elog(FATAL, "No pg_hba.conf entry for host %s, user %s, database %s", @@ -464,7 +462,7 @@ ClientAuthentication(Port *port) elog(FATAL, "pg_local_sendauth: can't do setsockopt: %m"); } #endif - if (port->raddr.sa.sa_family == AF_UNIX) + if (port->raddr.addr.ss_family == AF_UNIX) sendAuthRequest(port, AUTH_REQ_SCM_CREDS); #endif status = authident(port); |