Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6db0a6b

Browse files
committed
Remove socket credentials defines not referenced.
1 parent 1919b62 commit 6db0a6b

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

src/backend/libpq/hba.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.115 2003/09/25 06:57:59 petere Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.116 2003/10/25 03:48:46 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -1433,15 +1433,15 @@ ident_unix(int sock, char *ident_user)
14331433
struct msghdr msg;
14341434

14351435
/* Credentials structure */
1436-
#ifdef HAVE_STRUCT_CMSGCRED
1436+
#if defined(HAVE_STRUCT_CMSGCRED)
14371437
typedef struct cmsgcred Cred;
14381438

14391439
#define cruid cmcred_uid
1440-
#elif HAVE_STRUCT_FCRED
1440+
#elif defined(HAVE_STRUCT_FCRED)
14411441
typedef struct fcred Cred;
14421442

14431443
#define cruid fc_uid
1444-
#elif HAVE_STRUCT_SOCKCRED
1444+
#elif defined(HAVE_STRUCT_SOCKCRED)
14451445
typedef struct sockcred Cred;
14461446

14471447
#define cruid sc_uid

src/interfaces/libpq/fe-auth.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.83 2003/08/04 02:40:16 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.84 2003/10/25 03:48:47 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -464,13 +464,6 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
464464
/* Point to start of first structure */
465465
struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
466466
#endif
467-
#ifdef HAVE_STRUCT_SOCKCRED
468-
/* Prevent padding */
469-
char cmsgmem[sizeof(struct cmsghdr) + sizeof(struct sockcred)];
470-
471-
/* Point to start of first structure */
472-
struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
473-
#endif
474467

475468
/*
476469
* The backend doesn't care what we send here, but it wants exactly

0 commit comments

Comments
 (0)