diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-11-11 21:15:34 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-11-11 21:15:34 +0000 |
| commit | 40c2c3270db9c33e22d219148c660f63c3ddf3ca (patch) | |
| tree | 4a6f1e1e9b286ba328e4bb1a6f761007902464d7 /lib | |
| parent | b3e8cf539d0105c2d1cbcab6b0090d3d034fd8ae (diff) | |
| download | curl-40c2c3270db9c33e22d219148c660f63c3ddf3ca.tar.gz | |
- Marco Maggi reported that compilation failed when configured --with-gssapi
and GNU GSS installed due to a missing mutual exclusion of header files in
the Kerberos 5 code path. He also verified that my patch worked for him.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/krb5.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/krb5.c b/lib/krb5.c index e76391228..36afc3c46 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -46,14 +46,17 @@ #include <netdb.h> #endif #include <string.h> -#ifdef HAVE_GSSMIT -/* MIT style */ -#include <gssapi/gssapi.h> -#include <gssapi/gssapi_generic.h> -#include <gssapi/gssapi_krb5.h> + +#ifdef HAVE_GSSGNU +# include <gss.h> +#elif defined HAVE_GSSMIT + /* MIT style */ +# include <gssapi/gssapi.h> +# include <gssapi/gssapi_generic.h> +# include <gssapi/gssapi_krb5.h> #else -/* Heimdal-style */ -#include <gssapi.h> + /* Heimdal-style */ +# include <gssapi.h> #endif #include "urldata.h" |