Patch from Goran Thyni

bmomjian · bmomjian · commit 50729ac76421 · 1997-11-10T02:21:18.000Z
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.24 1997/11/07 20:51:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.25 1997/11/10 02:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -582,15 +582,16 @@ static void do_unlink()
 int
 StreamServerPort(char *hostName, short portName, int *fdP)
 {
-	struct sockaddr_in sin;
-	struct sockaddr_un sun;
+        union {
+	  struct sockaddr_in in;
+	  struct sockaddr_un un;
+	} saddr;
 	int			fd, err, family;
+	size_t                  len;
 	int			one = 1;
 
 	family = hostName != NULL ? AF_INET : AF_UNIX;
 
-	MemSet((char *) &sin, 0, sizeof sin);
-
 	if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
 	{
 		sprintf(PQerrormsg,
@@ -611,23 +612,21 @@ StreamServerPort(char *hostName, short portName, int *fdP)
 		pqdebug("%s", PQerrormsg);
 		return (STATUS_ERROR);
 	}
+	bzero(&saddr, sizeof(saddr));
 	if (family == AF_UNIX)
 	  {
-	    size_t len;
-	    bzero(&sun, sizeof(sun));
-	    sun.sun_family = family;
-	    len = UNIXSOCK_PATH(sun,portName);
-	    strcpy(sock_path, sun.sun_path);
-	    err = bind(fd, (struct sockaddr *) &sun, len);
+	    saddr.un.sun_family = family;
+	    len = UNIXSOCK_PATH(saddr.un,portName);
+	    strcpy(sock_path, saddr.un.sun_path);
 	  }
 	else
 	  {
-	    bzero(&sin, sizeof(sin));
-	    sin.sin_family = family;
-	    sin.sin_addr.s_addr = htonl(INADDR_ANY);
-	    sin.sin_port = htons(portName);
-	    err = bind(fd, (struct sockaddr *) &sin, sizeof sin);
+	    saddr.in.sin_family = family;
+	    saddr.in.sin_addr.s_addr = htonl(INADDR_ANY);
+	    saddr.in.sin_port = htons(portName);
+	    len = sizeof saddr.in;
 	  }
+	err = bind(fd, (struct sockaddr *) &saddr, len);
 	if (err < 0)
 	{
 		sprintf(PQerrormsg,

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.24 1997/11/07 20:51:34 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.25 1997/11/10 02:21:18 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -582,15 +582,16 @@ static void do_unlink()`
`582`	`582`	`int`
`583`	`583`	`StreamServerPort(char hostName, short portName, int fdP)`
`584`	`584`	`{`
`585`		`- struct sockaddr_in sin;`
`586`		`- struct sockaddr_un sun;`
	`585`	`+ union {`
	`586`	`+ struct sockaddr_in in;`
	`587`	`+ struct sockaddr_un un;`
	`588`	`+ } saddr;`
`587`	`589`	`int fd, err, family;`
	`590`	`+ size_t len;`
`588`	`591`	`int one = 1;`
`589`	`592`
`590`	`593`	`family = hostName != NULL ? AF_INET : AF_UNIX;`
`591`	`594`
`592`		`- MemSet((char *) &sin, 0, sizeof sin);`
`593`		`-`
`594`	`595`	`if ((fd = socket(family, SOCK_STREAM, 0)) < 0)`
`595`	`596`	`{`
`596`	`597`	`sprintf(PQerrormsg,`
`@@ -611,23 +612,21 @@ StreamServerPort(char hostName, short portName, int fdP)`
`611`	`612`	`pqdebug("%s", PQerrormsg);`
`612`	`613`	`return (STATUS_ERROR);`
`613`	`614`	`}`
	`615`	`+ bzero(&saddr, sizeof(saddr));`
`614`	`616`	`if (family == AF_UNIX)`
`615`	`617`	`{`
`616`		`- size_t len;`
`617`		`- bzero(&sun, sizeof(sun));`
`618`		`- sun.sun_family = family;`
`619`		`- len = UNIXSOCK_PATH(sun,portName);`
`620`		`- strcpy(sock_path, sun.sun_path);`
`621`		`- err = bind(fd, (struct sockaddr *) &sun, len);`
	`618`	`+ saddr.un.sun_family = family;`
	`619`	`+ len = UNIXSOCK_PATH(saddr.un,portName);`
	`620`	`+ strcpy(sock_path, saddr.un.sun_path);`
`622`	`621`	`}`
`623`	`622`	`else`
`624`	`623`	`{`
`625`		`- bzero(&sin, sizeof(sin));`
`626`		`- sin.sin_family = family;`
`627`		`- sin.sin_addr.s_addr = htonl(INADDR_ANY);`
`628`		`- sin.sin_port = htons(portName);`
`629`		`- err = bind(fd, (struct sockaddr *) &sin, sizeof sin);`
	`624`	`+ saddr.in.sin_family = family;`
	`625`	`+ saddr.in.sin_addr.s_addr = htonl(INADDR_ANY);`
	`626`	`+ saddr.in.sin_port = htons(portName);`
	`627`	`+ len = sizeof saddr.in;`
`630`	`628`	`}`
	`629`	`+ err = bind(fd, (struct sockaddr *) &saddr, len);`
`631`	`630`	`if (err < 0)`
`632`	`631`	`{`
`633`	`632`	`sprintf(PQerrormsg,`