From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 13 Dec 2005 03:36:14 +0000 (+0000)
Subject: Remove unused HAVE_STRUCT_SOCKCRED code, which was causing a duplicate-
X-Git-Tag: REL7_3_13~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93bcee8d4e25337ee046aa7dd40ed97d66219b0d;p=thirdparty%2Fpostgresql.git

Remove unused HAVE_STRUCT_SOCKCRED code, which was causing a duplicate-
variable-definition error on recent FreeBSDen (evidently, that platform
also HAS_STRUCT_CMSGCRED).  Backport of 7.4 fix dated 2003-10-25.
---

diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 5a6e492b644..b8a4069a71d 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.71 2002/09/04 20:31:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.71.2.1 2005/12/13 03:36:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,13 +461,6 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
 	/* Point to start of first structure */
 	struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
 #endif
-#ifdef HAVE_STRUCT_SOCKCRED
-	/* Prevent padding */
-	char		cmsgmem[sizeof(struct cmsghdr) + sizeof(struct sockcred)];
-
-	/* Point to start of first structure */
-	struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
-#endif
 
 	/*
 	 * The backend doesn't care what we send here, but it wants exactly