5053N/ADeveloped in-house at Oracle

5739N/APut our solution into an attachment and comment in cyrus bugzilla:

5739N/A Bug 3705 - cmulocal/sasl2.m4 has broken gssapi logic

5739N/A

5053N/A

5053N/Adiff -rupN old/cmulocal/sasl2.m4 new/cmulocal/sasl2.m4

5053N/A--- old/cmulocal/sasl2.m4 2015-01-16 15:18:02.047946282 -0800

5053N/A+++ new/cmulocal/sasl2.m4 2015-01-16 15:31:22.716646757 -0800

5053N/A@@ -73,10 +73,12 @@ if test "$gssapi" != no; then

5053N/A

5053N/A fi

5053N/A

5053N/A-if test "$gssapi" != no; then

5053N/A- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then

5053N/A- AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file])

5053N/A- fi

5053N/A+ if test "$gssapi" != no; then

5053N/A+ if test "$ac_cv_header_gssapi_h" = "yes" ; then

5053N/A+ AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file])

5053N/A+ elif test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then

5053N/A+ AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,,[Define for gssapi/gssapi.h header file])

5053N/A+ fi

5053N/A

5053N/A # We need to find out which gssapi implementation we are

5053N/A # using. Supported alternatives are: MIT Kerberos 5,

5053N/Adiff -rupN old/config.h.in new/config.h.in

5053N/A--- old/config.h.in 2015-01-16 15:14:54.941649896 -0800

5053N/A+++ new/config.h.in 2015-01-16 15:16:16.884212684 -0800

5053N/A@@ -122,6 +122,9 @@

5053N/A /* Define if you have the gssapi.h header file */

5053N/A #undef HAVE_GSSAPI_H

5053N/A

5053N/A+/* Define if you have the gssapi/gssapi.h header file */

5053N/A+#undef HAVE_GSSAPI_GSSAPI_H

5053N/A+

5053N/A /* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function.

5053N/A */

5053N/A #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY