aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-10-25 03:48:47 +0000
committerBruce Momjian <bruce@momjian.us>2003-10-25 03:48:47 +0000
commit6db0a6b0352ff4644166f3b257e2e13103b770f9 (patch)
tree38f3861cae8794dba43342e21fe943a4427f6805
parent1919b620584ff24d33159076c0d683ca6b199166 (diff)
downloadpostgresql-6db0a6b0352ff4644166f3b257e2e13103b770f9.tar.gz
postgresql-6db0a6b0352ff4644166f3b257e2e13103b770f9.zip
Remove socket credentials defines not referenced.
-rw-r--r--src/backend/libpq/hba.c8
-rw-r--r--src/interfaces/libpq/fe-auth.c9
2 files changed, 5 insertions, 12 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 8c67138a672..5ac2610ac78 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.115 2003/09/25 06:57:59 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.116 2003/10/25 03:48:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1433,15 +1433,15 @@ ident_unix(int sock, char *ident_user)
struct msghdr msg;
/* Credentials structure */
-#ifdef HAVE_STRUCT_CMSGCRED
+#if defined(HAVE_STRUCT_CMSGCRED)
typedef struct cmsgcred Cred;
#define cruid cmcred_uid
-#elif HAVE_STRUCT_FCRED
+#elif defined(HAVE_STRUCT_FCRED)
typedef struct fcred Cred;
#define cruid fc_uid
-#elif HAVE_STRUCT_SOCKCRED
+#elif defined(HAVE_STRUCT_SOCKCRED)
typedef struct sockcred Cred;
#define cruid sc_uid
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 34ea7ea2469..98c86b32cbe 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.83 2003/08/04 02:40:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.84 2003/10/25 03:48:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -464,13 +464,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