Blame SOURCES/mod_auth_kerb-5.4-rcopshack.patch

b2b3b1
b2b3b1
Remove the Krb5 1.3.x-specific hack which mucks about with
b2b3b1
libkrb5 internals, and shouldn't.
b2b3b1
b2b3b1
--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.rcopshack
b2b3b1
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
b2b3b1
@@ -285,34 +285,6 @@ mkstemp(char *template)
b2b3b1
 }
b2b3b1
 #endif
b2b3b1
 
b2b3b1
-#if defined(KRB5) && !defined(HEIMDAL)
b2b3b1
-/* Needed to work around problems with replay caches */
b2b3b1
-#include "mit-internals.h"
b2b3b1
-
b2b3b1
-/* This is our replacement krb5_rc_store function */
b2b3b1
-static krb5_error_code KRB5_LIB_FUNCTION
b2b3b1
-mod_auth_kerb_rc_store(krb5_context context, krb5_rcache rcache,
b2b3b1
-                       krb5_donot_replay_internal *donot_replay)
b2b3b1
-{
b2b3b1
-   return 0;
b2b3b1
-}
b2b3b1
-
b2b3b1
-/* And this is the operations vector for our replay cache */
b2b3b1
-const krb5_rc_ops_internal mod_auth_kerb_rc_ops = {
b2b3b1
-  0,
b2b3b1
-  "dfl",
b2b3b1
-  krb5_rc_dfl_init,
b2b3b1
-  krb5_rc_dfl_recover,
b2b3b1
-  krb5_rc_dfl_destroy,
b2b3b1
-  krb5_rc_dfl_close,
b2b3b1
-  mod_auth_kerb_rc_store,
b2b3b1
-  krb5_rc_dfl_expunge,
b2b3b1
-  krb5_rc_dfl_get_span,
b2b3b1
-  krb5_rc_dfl_get_name,
b2b3b1
-  krb5_rc_dfl_resolve
b2b3b1
-};
b2b3b1
-#endif
b2b3b1
-
b2b3b1
 /*************************************************************************** 
b2b3b1
  Auth Configuration Initialization
b2b3b1
  ***************************************************************************/
b2b3b1
@@ -1252,31 +1224,6 @@ get_gss_creds(request_rec *r,
b2b3b1
       return HTTP_INTERNAL_SERVER_ERROR;
b2b3b1
    }
b2b3b1
 
b2b3b1
-#ifndef HEIMDAL
b2b3b1
-   /*
b2b3b1
-    * With MIT Kerberos 5 1.3.x the gss_cred_id_t is the same as
b2b3b1
-    * krb5_gss_cred_id_t and krb5_gss_cred_id_rec contains a pointer to
b2b3b1
-    * the replay cache.
b2b3b1
-    * This allows us to override the replay cache function vector with
b2b3b1
-    * our own one.
b2b3b1
-    * Note that this is a dirty hack to get things working and there may
b2b3b1
-    * well be unknown side-effects.
b2b3b1
-    */
b2b3b1
-   {
b2b3b1
-      krb5_gss_cred_id_t gss_creds = (krb5_gss_cred_id_t) *server_creds;
b2b3b1
-
b2b3b1
-      /* First we try to verify we are linked with 1.3.x to prevent from
b2b3b1
-         crashing when linked with 1.4.x */
b2b3b1
-      if (gss_creds && (gss_creds->usage == GSS_C_ACCEPT)) {
b2b3b1
-	 if (gss_creds->rcache && gss_creds->rcache->ops &&
b2b3b1
-	     gss_creds->rcache->ops->type &&  
b2b3b1
-	     memcmp(gss_creds->rcache->ops->type, "dfl", 3) == 0)
b2b3b1
-          /* Override the rcache operations */
b2b3b1
-	 gss_creds->rcache->ops = &mod_auth_kerb_rc_ops;
b2b3b1
-      }
b2b3b1
-   }
b2b3b1
-#endif
b2b3b1
-   
b2b3b1
    return 0;
b2b3b1
 }
b2b3b1