components/cyrus-sasl/patches/104-gssapi-gssapi-h.patch
author Jan Parcel <jan.parcel@oracle.com>
Tue, 03 Nov 2015 14:27:41 -0800
changeset 5055 9daf220c1a9a
child 5741 b943514525d4
permissions -rw-r--r--
PSARC/2015/194 libsasl ON to Userland migration and update 20855050 Update libsasl 2.1.15 to 2.1.26 and migrate to Userland consolidation 15242150 SUNBT6211461 SASL library missing extras 20544079 sasl install dir for plugins should be separately configurable 20544093 ifdef sun for gethostname in saslutil.c is obsolete 20544122 libtool.m4 overrides configuration for --no-verify 20544160 incorrect function definition for do_request in ipc_doors.c 20544105 sasl adjustment for location of gssapi.h incorrectly implemented 21058782 CMU cyrus-sasl missing man pages that we require 21099377 Moving to autotools 1.15 breaks cmu cyrus-sasl build 21131962 libsasl mv to Userland means subversion requires system/library/security/libsasl 22052798 openldap slapd refuses to run if libsasl updated unless openldap recompiled

Developed in-house at Oracle 
sasl adjustment for location of gssapi.h incorrectly implemented.
Intended to go upstream

diff -rupN old/cmulocal/sasl2.m4 new/cmulocal/sasl2.m4
--- old/cmulocal/sasl2.m4	2015-01-16 15:18:02.047946282 -0800
+++ new/cmulocal/sasl2.m4	2015-01-16 15:31:22.716646757 -0800
@@ -73,10 +73,12 @@ if test "$gssapi" != no; then
 
 fi
 
-if test "$gssapi" != no; then
-  if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
-    AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file])
-  fi
+ if test "$gssapi" != no; then
+    if test "$ac_cv_header_gssapi_h" = "yes" ; then
+      AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file])
+    elif test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
+      AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,,[Define for gssapi/gssapi.h header file])
+    fi
 
   # We need to find out which gssapi implementation we are
   # using. Supported alternatives are: MIT Kerberos 5,
diff -rupN old/config.h.in new/config.h.in
--- old/config.h.in	2015-01-16 15:14:54.941649896 -0800
+++ new/config.h.in	2015-01-16 15:16:16.884212684 -0800
@@ -122,6 +122,9 @@
 /* Define if you have the gssapi.h header file */
 #undef HAVE_GSSAPI_H
 
+/* Define if you have the gssapi/gssapi.h header file */
+#undef HAVE_GSSAPI_GSSAPI_H
+
 /* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function.
    */
 #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY