diff options
| author | Bruce Momjian | 2002-12-06 04:37:05 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2002-12-06 04:37:05 +0000 |
| commit | 38ffbb95d5956e458fa0bd7e473ed25cd020f7be (patch) | |
| tree | 3833b7f7e2eade35856b73e9a94e7895f8b7bcd3 /src/backend/postmaster | |
| parent | 4bfd1ad9e04efcc196052477522e356e8c5194d7 (diff) | |
Back out V6 code, caused postmaster startup failure.
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 07787844903..c1a25645a45 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.300 2002/12/06 03:46:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.301 2002/12/06 04:37:02 momjian Exp $ * * NOTES * @@ -669,7 +669,7 @@ PostmasterMain(int argc, char *argv[]) */ if (NetServer) { - status = StreamServerPort(AF_INET6, VirtualHost, + status = StreamServerPort(AF_INET, VirtualHost, (unsigned short) PostPortNumber, UnixSocketDir, &ServerSock_INET); @@ -2091,14 +2091,13 @@ DoBackend(Port *port) /* * Get the remote host name and port for logging and status display. */ - if (isAF_INETx(&port->raddr)) + if (port->raddr.sa.sa_family == AF_INET) { unsigned short remote_port; char *host_addr; - char ip_hostinfo[INET6_ADDRSTRLEN]; remote_port = ntohs(port->raddr.in.sin_port); - host_addr = SockAddr_ntop(&port->raddr, ip_hostinfo, INET6_ADDRSTRLEN, 1); + host_addr = inet_ntoa(port->raddr.in.sin_addr); remote_host = NULL; |