]>
Commit | Line | Data |
---|---|---|
94e6777d JB |
1 | --- cyrus-sasl-2.1.25/cmulocal/sasl2.m4.orig 2011-09-02 14:58:00.000000000 +0200 |
2 | +++ cyrus-sasl-2.1.25/cmulocal/sasl2.m4 2011-09-16 21:53:44.032825454 +0200 | |
3 | @@ -268,7 +268,21 @@ | |
b6a2eee9 JR |
4 | |
5 | cmu_save_LIBS="$LIBS" | |
6 | LIBS="$LIBS $GSSAPIBASE_LIBS" | |
7 | - AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) | |
8 | + dnl AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) | |
9 | + AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_KRB5_H,,[Define if you have the gssapi/gssapi_krb5.h header file])) | |
10 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |
11 | +#ifdef HAVE_GSSAPI_H | |
12 | +#include <gssapi.h> | |
13 | +#else | |
14 | +#include <gssapi/gssapi.h> | |
15 | +#endif | |
16 | +#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H | |
17 | +#include <gssapi/gssapi_krb5.h> | |
18 | +#endif | |
19 | +]],[[gsskrb5_register_acceptor_identity("");]]) | |
20 | +],[AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,, | |
21 | + [Define if your GSSAPI implimentation defines GSSKRB5_REGISTER_ACCEPTOR_IDENTITY]) | |
22 | +]) | |
94e6777d JB |
23 | AC_CHECK_FUNCS(gss_decapsulate_token) |
24 | AC_CHECK_FUNCS(gss_encapsulate_token) | |
25 | AC_CHECK_FUNCS(gss_oid_equal) | |
b6a2eee9 JR |
26 | diff -u -r cyrus-sasl-2.1.21-orig/plugins/gssapi.c cyrus-sasl-2.1.21/plugins/gssapi.c |
27 | --- cyrus-sasl-2.1.21-orig/plugins/gssapi.c 2004-07-21 16:39:06.000000000 +0200 | |
28 | +++ cyrus-sasl-2.1.21/plugins/gssapi.c 2006-08-01 08:30:26.000000000 +0200 | |
29 | @@ -50,6 +50,9 @@ | |
30 | #else | |
31 | #include <gssapi/gssapi.h> | |
32 | #endif | |
33 | +#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H | |
34 | +#include <gssapi/gssapi_krb5.h> | |
35 | +#endif | |
36 | ||
37 | #ifdef WIN32 | |
38 | # include <winsock2.h> |