Postmaster erroneously rejected SSL connections on IPv6.

tglsfdc · tglsfdc · commit 5b545644cfe8 · 2003-08-01T23:25:00.000Z
diff --git 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.337 2003/07/27 21:49:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.338 2003/08/01 23:25:00 tgl Exp $
  *
  * NOTES
  *
@@ -1232,7 +1232,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 
 #ifdef USE_SSL
 		/* No SSL when disabled or on Unix sockets */
-		if (!EnableSSL || port->laddr.addr.ss_family != AF_INET)
+		if (!EnableSSL || IS_AF_UNIX(port->laddr.addr.ss_family))
 			SSLok = 'N';
 		else
 			SSLok = 'S';		/* Support for SSL */

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.337 2003/07/27 21:49:54 tgl Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.338 2003/08/01 23:25:00 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1232,7 +1232,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)`
`1232`	`1232`
`1233`	`1233`	`#ifdef USE_SSL`
`1234`	`1234`	`/* No SSL when disabled or on Unix sockets */`
`1235`		`- if (!EnableSSL \|\| port->laddr.addr.ss_family != AF_INET)`
	`1235`	`+ if (!EnableSSL \|\| IS_AF_UNIX(port->laddr.addr.ss_family))`
`1236`	`1236`	`SSLok = 'N';`
`1237`	`1237`	`else`
`1238`	`1238`	`SSLok = 'S'; /* Support for SSL */`