From 33c7c046481bf5df5b2330aafd8a34e7953e2814 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Jun 24 2013 17:07:40 +0000
Subject: detect gsskrb5_register_acceptor_identity macro <nalin@redhat.com> (#976538)


---

diff --git a/cyrus-sasl-2.1.26-keytab.patch b/cyrus-sasl-2.1.26-keytab.patch
new file mode 100644
index 0000000..2eda613
--- /dev/null
+++ b/cyrus-sasl-2.1.26-keytab.patch
@@ -0,0 +1,38 @@
+diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
+index 3c2841a..b086b8f 100644
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
+@@ -269,6 +269,18 @@ if test "$gssapi" != no; then
+   cmu_save_LIBS="$LIBS"
+   LIBS="$LIBS $GSSAPIBASE_LIBS"
+   AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
++  if test "$ac_cv_func_gsskrb5_register_acceptor_identity" = no ; then
++    AC_CHECK_HEADERS(gssapi/gssapi_krb5.h)
++    if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
++      AC_CHECK_DECL(gsskrb5_register_acceptor_identity,
++                    [AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,1,
++                               [Define if your GSSAPI implementation defines gsskrb5_register_acceptor_identity])],,
++                    [
++                    AC_INCLUDES_DEFAULT
++                    #include <gssapi/gssapi_krb5.h>
++                    ])
++    fi
++  fi
+   AC_CHECK_FUNCS(gss_decapsulate_token)
+   AC_CHECK_FUNCS(gss_encapsulate_token)
+   AC_CHECK_FUNCS(gss_oid_equal)
+diff --git a/plugins/gssapi.c b/plugins/gssapi.c
+index 6be9d23..e6fcf46 100644
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -51,6 +51,10 @@
+ #include <gssapi/gssapi.h>
+ #endif
+ 
++#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
++#include <gssapi/gssapi_krb5.h>
++#endif
++
+ #ifdef WIN32
+ #  include <winsock2.h>
+ 
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index c091395..e3d2072 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -44,6 +44,8 @@ Patch45: cyrus-sasl-2.1.26-obsolete-macro.patch
 Patch46: cyrus-sasl-2.1.26-size_t.patch
 # disable incorrect check for MkLinux
 Patch47: cyrus-sasl-2.1.26-ppc.patch
+# detect gsskrb5_register_acceptor_identity macro (#976538)
+Patch48: cyrus-sasl-2.1.26-keytab.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -182,6 +184,7 @@ chmod -x include/*.h
 %patch45 -p1 -b .obsolete-macro
 %patch46 -p1 -b .size_t
 %patch47 -p1 -b .ppc
+%patch48 -p1 -b .keytab
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS