diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/auth.c | 6 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 6 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 6 |
5 files changed, 26 insertions, 4 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 1b0356a02d8..c8cd80958d9 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.150 2007/07/11 08:27:33 mha Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.151 2007/07/12 14:36:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -302,7 +302,11 @@ pg_krb5_recvauth(Port *port) *---------------------------------------------------------------- */ +#if defined(HAVE_GSSAPI_H) +#include <gssapi.h> +#else #include <gssapi/gssapi.h> +#endif #ifdef WIN32 /* diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 095ac91957f..5e15bcdec73 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.59 2007/07/10 13:14:21 mha Exp $ + * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.60 2007/07/12 14:36:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -30,8 +30,12 @@ #endif #ifdef ENABLE_GSS +#if defined(HAVE_GSSAPI_H) +#include <gssapi.h> +#else #include <gssapi/gssapi.h> #endif +#endif #include "libpq/hba.h" #include "libpq/pqcomm.h" diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index e2962d123c7..a0e451b0e0c 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -172,6 +172,12 @@ /* Define to 1 if you have the `getrusage' function. */ #undef HAVE_GETRUSAGE +/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ +#undef HAVE_GSSAPI_GSSAPI_H + +/* Define to 1 if you have the <gssapi.h> header file. */ +#undef HAVE_GSSAPI_H + /* Define to 1 if you have the <history.h> header file. */ #undef HAVE_HISTORY_H diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index f19ef07671d..ca92d44f8a9 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 - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.125 2007/07/12 14:10:39 mha Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.126 2007/07/12 14:36:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -329,7 +329,11 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s /* * GSSAPI authentication system. */ +#if defined(HAVE_GSSAPI_H) +#include <gssapi.h> +#else #include <gssapi/gssapi.h> +#endif #ifdef WIN32 /* diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index cbefdd8e0fb..b497e1d68d1 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.122 2007/07/10 13:14:22 mha Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.123 2007/07/12 14:36:52 mha Exp $ * *------------------------------------------------------------------------- */ @@ -45,8 +45,12 @@ #include "pqexpbuffer.h" #ifdef ENABLE_GSS +#if defined(HAVE_GSSAPI_H) +#include <gssapi.h> +#else #include <gssapi/gssapi.h> #endif +#endif #ifdef USE_SSL #include <openssl/ssl.h> |