diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-08-01 23:52:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-08-01 23:52:50 +0000 |
| commit | cb90b2dacb14b774ad3ddc68d78ec52f45db78bf (patch) | |
| tree | e4eec86281567ada4d7d3643828c329344348808 /src | |
| parent | bc042e0a775040927b194473b4abf9c48e56d0a5 (diff) | |
| download | postgresql-cb90b2dacb14b774ad3ddc68d78ec52f45db78bf.tar.gz postgresql-cb90b2dacb14b774ad3ddc68d78ec52f45db78bf.zip | |
Digging through previous discussion of this patch, I note where Peter E.
points out how silly it is to use Autoconf to test for a preprocessor
symbol, when one can equally easily #ifdef on the symbol itself.
Accordingly, revert configure to prior state and do it that way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/hba.c | 17 | ||||
| -rw-r--r-- | src/include/config.h.in | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 905cb61121f..b16571a4542 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -5,7 +5,12 @@ * wherein you authenticate a user by seeing what IP address the system * says he comes from and possibly using ident). * - * $Id: hba.c,v 1.58 2001/08/01 23:25:39 tgl Exp $ + * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * + * IDENTIFICATION + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.59 2001/08/01 23:52:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -292,7 +297,7 @@ parse_hba(List *line, hbaPort *port, bool *found_p, bool *error_p) if (port->auth_method == uaKrb4 || port->auth_method == uaKrb5) goto hba_syntax; -#ifndef HAVE_SO_PEERCRED +#ifndef SO_PEERCRED if (port->auth_method == uaIdent) { /* Give a special error message for this case... */ @@ -861,7 +866,8 @@ ident_inet(const struct in_addr remote_ip_addr, return ident_return; } -#ifdef HAVE_SO_PEERCRED +#ifdef SO_PEERCRED + /* * Ask kernel about the credentials of the connecting process and * determine the symbolic name of the corresponding user. @@ -923,7 +929,8 @@ ident_unix(int sock, char *ident_user) return true; } -#endif + +#endif /* SO_PEERCRED */ /* * Determine the username of the initiator of the connection described @@ -947,7 +954,7 @@ authident(hbaPort *port) port->laddr.in.sin_port, ident_user)) return STATUS_ERROR; break; -#ifdef HAVE_SO_PEERCRED +#ifdef SO_PEERCRED case AF_UNIX: if (!ident_unix(port->sock, ident_user)) return STATUS_ERROR; diff --git a/src/include/config.h.in b/src/include/config.h.in index 971a32a3ace..c0559089eb6 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -8,7 +8,7 @@ * or in config.h afterwards. Of course, if you edit config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: config.h.in,v 1.169 2001/08/01 23:25:39 tgl Exp $ + * $Id: config.h.in,v 1.170 2001/08/01 23:52:50 tgl Exp $ */ #ifndef CONFIG_H @@ -685,9 +685,6 @@ extern int fdatasync(int fildes); /* Define if you have on_exit() */ #undef HAVE_ON_EXIT -/* Define if you have SO_PEERCRED */ -#undef HAVE_SO_PEERCRED - /* *------------------------------------------------------------------------ * Part 4: pull in system-specific declarations. |