git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c

index 8c67138a6728855129287343e68e59696e27205b..5ac2610ac78e7a634c9332e11da030600773c24e 100644 (file)

--- a/src/backend/libpq/hba.c

+++ b/src/backend/libpq/hba.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

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 34ea7ea24696006dfa56e239f44e6afa65f34b25..98c86b32cbe2e672d46c7193b652b0a5f1386656 100644 (file)

--- a/src/interfaces/libpq/fe-auth.c

+++ b/src/interfaces/libpq/fe-auth.c

* 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 $

*

*-------------------------------------------------------------------------

*/

/* 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