diff options
| author | Magnus Hagander | 2007-07-12 14:36:52 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2007-07-12 14:36:52 +0000 |
| commit | 65a513c2490983e1b95710a805e7cb71956120bc (patch) | |
| tree | f782fddac637ac22439e9f0b2898a056058f3bf4 /src/interfaces | |
| parent | 67719940585f36617a15dac16a32744a18711ede (diff) | |
Support GSSAPI builds where the header is <gssapi.h> and not <gssapi/gssapi.h>,
such as OpenBSD (possibly all Heimdal).
Stefan Kaltenbrunner
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index f19ef07671..ca92d44f8a 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 cbefdd8e0f..b497e1d68d 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> |