A bit of a hacky patch to remove some old Heimdal conditional code and build with gcc-4.6

heimdal.patch (text/plain), 1.21 KB, created by Spooky Ghost on 2013-01-31 11:45:07 UTC

diff -ur mod_auth_kerb-5.4.orig/Makefile.in mod_auth_kerb-5.4/Makefile.in
--- mod_auth_kerb-5.4.orig/Makefile.in.orig    2013-01-31 09:53:26.877199802 +0000
+++ mod_auth_kerb-5.4.orig/Makefile.in 2013-01-31 09:53:44.851974756 +0000
@@ -1,5 +1,5 @@
 APXS = @APXS@
-KRB5_CPPFLAGS = @KRB5_CPPFLAGS@
+KRB5_CPPFLAGS = @KRB5_CPPFLAGS@ -Wno-deprecated-declarations
 KRB5_LDFLAGS = @KRB5_LDFLAGS@
 KRB4_CPPFLAGS = @KRB4_CPPFLAGS@
 KRB4_LDFLAGS = @KRB4_LDFLAGS@
diff -ur mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c	2008-12-04 10:14:03.000000000 +0000
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c	2011-10-28 18:01:11.632593004 +0100
@@ -87,17 +87,8 @@
 
 #ifdef KRB5
 #include <krb5.h>
-#ifdef HEIMDAL
 #  include <gssapi.h>
-#else
-#  include <gssapi/gssapi.h>
-#  include <gssapi/gssapi_generic.h>
 #  include <gssapi/gssapi_krb5.h>
-#  define GSS_C_NT_USER_NAME gss_nt_user_name
-#  define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#  define GSS_KRB5_NT_PRINCIPAL_NAME gss_nt_krb5_name
-#  define krb5_get_err_text(context,code) error_message(code)
-#endif
 #ifndef GSSAPI_SUPPORTS_SPNEGO
 #  include "spnegokrb5.h"
 #endif