Cleanups
[mod_auth_kerb.cvs/.git] / src / mod_auth_kerb.c
index f4b2585..92a062a 100644 (file)
@@ -1,7 +1,5 @@
-/*************************************************************************** 
- Included Headers And Module Declaration
- ***************************************************************************/
-#ifdef APXS1
+#ident "$Id$"
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -9,32 +7,26 @@
 #include "http_protocol.h"
 #include "http_request.h"
 
-module kerb_auth_module;
-#else
-#ifdef APXS2
+#if 0
 #include "apr_strings.h"
 #include "apr_lib.h"
 #include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-module AP_MODULE_DECLARE_DATA kerb_auth_module;
-#endif /* APXS2 */
-#endif /* APXS1 */
+#endif
 
 #ifdef KRB5
 #include <krb5.h>
+#include <gssapi.h>
 #endif /* KRB5 */
 
 #ifdef KRB4
 #include <krb.h>
 #endif /* KRB4 */
 
-
+#ifdef APXS1
+module kerb_auth_module;
+#else
+module AP_MODULE_DECLARE_DATA kerb_auth_module;
+#endif
 
 
 /*************************************************************************** 
@@ -47,23 +39,19 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module;
 #define MK_TABLE_TYPE table
 #define MK_PSTRDUP ap_pstrdup
 #define MK_PROXY STD_PROXY
-#define MK_RERROR_LEVEL ""
 #define MK_USER r->connection->user
 #define MK_AUTH_TYPE r->connection->ap_auth_type
 #define MK_ARRAY_HEADER array_header
 #else
-#ifdef APXS2
 #define MK_POOL apr_pool_t
 #define MK_TABLE_GET apr_table_get
 #define MK_TABLE_SET apr_table_set
 #define MK_TABLE_TYPE apr_table_t
 #define MK_PSTRDUP apr_pstrdup
 #define MK_PROXY PROXYREQ_PROXY
-#define MK_RERROR_LEVEL "0, "
 #define MK_USER r->user
 #define MK_AUTH_TYPE r->ap_auth_type
 #define MK_ARRAY_HEADER apr_array_header_t
-#endif /* APXS2 */
 #endif /* APXS1 */
 
 
@@ -73,27 +61,216 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module;
  Auth Configuration Structure
  ***************************************************************************/
 typedef struct {
-       char *krb_auth_type;
+       int krb_auth_enable;
+       char *krb_auth_realms;
+       int krb_fail_status;
+       char *krb_force_instance;
+       int krb_save_credentials;
+       char *krb_tmp_dir;
+       char *service_name;
+       char *krb_lifetime;
+#ifdef KRB5
+       char *krb_5_keytab;
+       int krb_forwardable;
+       int krb_method_gssapi;
+       int krb_method_k5pass;
+#endif
 #ifdef KRB4
        char *krb_4_srvtab;
+       int krb_method_k4pass;
+#endif
+} kerb_auth_config;
+
+#ifdef APXS1
+static const command_rec kerb_auth_cmds[] = {
+   { "AuthKerberos", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_auth_enable),
+     OR_AUTHCFG, FLAG, "Permit Kerberos auth without AuthType requirement." },
+     
+   { "KrbAuthRealm", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_auth_realms),
+     OR_AUTHCFG, ITERATE, "Realms to attempt authentication against (can be multiple)." },
+     
+   { "KrbAuthRealms", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_auth_realms),
+     OR_AUTHCFG, ITERATE, "Alias for KrbAuthRealm." },
+
+#if 0
+   { "KrbFailStatus", kerb_set_fail_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_fail_status),
+     OR_AUTHCFG, TAKE1, "If auth fails, return status set here." },
+#endif
+
+   { "KrbForceInstance", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_force_instance),
+     OR_AUTHCFG, TAKE1, "Force authentication against an instance specified here." },
+
+    { "KrbSaveCredentials", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_save_credentials),
+     OR_AUTHCFG, FLAG, "Save and store credentials/tickets retrieved during auth." },
+
+   { "KrbSaveTickets", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_save_credentials),
+     OR_AUTHCFG, FLAG, "Alias for KrbSaveCredentials." },
+
+   { "KrbTmpdir", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_tmp_dir),
+     OR_AUTHCFG, TAKE1, "Path to store ticket files and such in." },
+
+   { "KrbServiceName", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, service_name),
+     OR_AUTHCFG, TAKE1, "Kerberos service name to be used by apache." },
+
+#if 0
+   { "KrbLifetime", ap_set_string_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_lifetime),
+     OR_AUTHCFG, TAKE1, "Kerberos ticket lifetime." },
+#endif
+
+#ifdef KRB5
+   { "Krb5Keytab", ap_set_file_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_5_keytab),
+     OR_AUTHCFG, TAKE1, "Location of Kerberos V5 keytab file." },
+
+   { "KrbForwardable", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_forwardable),
+     OR_AUTHCFG, FLAG, "Credentials retrieved will be flagged as forwardable."},
+
+   { "KrbMethodGSSAPI", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_method_gssapi),
+     OR_AUTHCFG, FLAG, "Enable GSSAPI authentication." },
+
+   { "KrbMethodK5Pass", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_method_k5pass), 
+     OR_AUTHCFG, FLAG, "Enable Kerberos V5 password authentication." },
+#endif 
+
+#ifdef KRB4
+   { "Krb4Srvtab", ap_set_file_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_4_srvtab),
+     OR_AUTHCFG, TAKE1, "Location of Kerberos V4 srvtab file." },
+
+   { "KrbMethodK4Pass", ap_set_flag_slot,
+     (void*)XtOffsetOf(kerb_auth_config, krb_method_k4pass),
+     OR_AUTHCFG, FLAG, "Enable Kerberos V4 password authentication." },
+#endif
+
+   { NULL }
+};
+#else
+static const command_rec kerb_auth_cmds[] = {
+   AP_INIT_FLAG("AuthKerberos", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_auth_enable),
+        OR_AUTHCFG, "Permit Kerberos auth without AuthType requirement."),
+
+   
+
+#ifdef KRB4
+   AP_INIT_TAKE1("Krb4Srvtab", ap_set_file_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_4_srvtab),
+        OR_AUTHCFG, "Location of Kerberos V4 srvtab file."),
 #endif /* KRB4 */
+
 #ifdef KRB5
-       char *krb_5_keytab;
+   AP_INIT_TAKE1("Krb5Keytab", ap_set_file_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_5_keytab),
+        OR_AUTHCFG, "Location of Kerberos V5 keytab file."),
 #endif /* KRB5 */
-       int krb_authoritative;
-       char *krb_default_realm;
-       int krb_fail_status;
-       char *krb_force_instance;
+
+#if 0
+   AP_INIT_FLAG("KrbAuthoritative", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_authoritative),
+        OR_AUTHCFG, "Refuse to pass request down to lower modules."),
+#endif
+
+   AP_INIT_ITERATE("KrbAuthRealm", ap_set_string_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_auth_realms),
+        OR_AUTHCFG, "Realm to attempt authentication against (can be multiple)."),
+
+#if 0
+   AP_INIT_TAKE1("KrbFailStatus", kerb_set_fail_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_fail_status),
+        OR_AUTHCFG, "If auth fails, return status set here."),
+#endif
+
+   AP_INIT_TAKE1("KrbForceInstance", ap_set_string_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_force_instance),
+        OR_AUTHCFG, "Force authentication against an instance specified here."),
+
 #ifdef KRB5
-       int krb_forwardable;
+   AP_INIT_FLAG("KrbForwardable", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_forwardable), 
+        OR_AUTHCFG, "Credentials retrieved will be flagged as forwardable."),
 #endif /* KRB5 */
-       char *krb_lifetime;
+
+   AP_INIT_TAKE1("KrbLifetime", ap_set_string_slot, 
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_lifetime), 
+        OR_AUTHCFG, "Lifetime of tickets retrieved."),
+
+#ifdef GSSAPI
+   AP_INIT_FLAG("KrbMethodGSSAPI", ap_set_flag_slot, 
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_method_gssapi), 
+        OR_AUTHCFG, "Enable GSSAPI authentication."),
+#endif /* GSSAPI */
+
+#ifdef KRB4
+   AP_INIT_FLAG("KrbMethodK4Pass", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_method_k4pass),
+        OR_AUTHCFG, "Enable Kerberos V4 password authentication."),
+#endif /* KRB4 */
+
 #ifdef KRB5
-       char *krb_renewable;
+   AP_INIT_FLAG("KrbMethodK5Pass", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_method_k5pass),
+        OR_AUTHCFG, "Enable Kerberos V5 password authentication."),
+
+   AP_INIT_TAKE1("KrbRenewable", ap_set_string_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_renewable),
+        OR_AUTHCFG, "Credentials retrieved will be renewable for this length."),
 #endif /* KRB5 */
-       int krb_save_credentials;
-       char *krb_tmp_dir;
-} kerb_auth_config;
+
+   AP_INIT_FLAG("KrbSaveCredentials", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_save_credentials),
+        OR_AUTHCFG, "Save and store credentials/tickets retrieved during auth."),
+
+   AP_INIT_FLAG("KrbSaveTickets", ap_set_flag_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_save_credentials),
+        OR_AUTHCFG, "Alias for KrbSaveCredentials."),
+
+   AP_INIT_TAKE1("KrbTmpdir", ap_set_string_slot,
+        (void*)APR_XtOffsetOf(kerb_auth_config, krb_tmp_dir),
+        OR_AUTHCFG, "Path to store ticket files and such in."),
+
+   { NULL }
+};
+#endif
+
+/*************************************************************************** 
+ GSSAPI Support Initialization
+ ***************************************************************************/
+#ifdef KRB5
+typedef struct {
+   gss_ctx_id_t context;
+   gss_cred_id_t server_creds;
+} gss_connection_t;
+
+static gss_connection_t *gss_connection = NULL;
+
+static void
+cleanup_gss_connection(void *data)
+{
+   OM_uint32 minor_status;
+   gss_connection_t *gss_conn = (gss_connection_t *)data;
+
+   if (data == NULL)
+      return;
+   if (gss_conn->context != GSS_C_NO_CONTEXT)
+      gss_delete_sec_context(&minor_status, &gss_conn->context,
+                            GSS_C_NO_BUFFER);
+   if (gss_conn->server_creds != GSS_C_NO_CREDENTIAL)
+      gss_release_cred(&minor_status, &gss_conn->server_creds);
+}
+#endif
 
 
 
@@ -101,13 +278,20 @@ typedef struct {
 /*************************************************************************** 
  Auth Configuration Initialization
  ***************************************************************************/
-static void *kerb_dir_config(MK_POOL *p, char *d)
+static void *kerb_dir_create_config(MK_POOL *p, char *d)
 {
-       static void *rec;
-       rec = (void *) ap_pcalloc(p, sizeof(kerb_auth_config));
+       kerb_auth_config *rec;
+
+       rec = (kerb_auth_config *) ap_pcalloc(p, sizeof(kerb_auth_config));
+       ((kerb_auth_config *)rec)->krb_auth_enable = 1;
        ((kerb_auth_config *)rec)->krb_fail_status = HTTP_UNAUTHORIZED;
-       ((kerb_auth_config *)rec)->krb_authoritative = 0;
-       ((kerb_auth_config *)rec)->krb_auth_type = MK_PSTRDUP(p, "None");
+#ifdef KRB5
+       ((kerb_auth_config *)rec)->krb_method_k5pass = 1;
+       ((kerb_auth_config *)rec)->krb_method_gssapi = 1;
+#endif
+#ifdef KRB4
+       ((kerb_auth_config *)rec)->krb_method_k4pass = 1;
+#endif
        return rec;
 }
 
@@ -132,356 +316,375 @@ static const char *kerb_set_fail_slot(cmd_parms *cmd, void *struct_ptr,
        return NULL;
 }
 
-/* these are either char *struct_ptr, char *arg or void *struct_ptr, const char *arg */
-static const char *kerb_set_type_slot(cmd_parms *cmd, void *struct_ptr,
-                                       const char *arg)
+
+#ifndef HEIMDAL
+krb5_error_code
+krb5_verify_user(krb5_context context, krb5_principal principal,
+                krb5_ccache ccache, const char *password, krb5_boolean secure,
+                const char *service)
 {
-       int offset = (int) (long) cmd->info;
-       if
-#ifdef KRB5
-          (!strncasecmp(arg, "v5", 2))
-               *(char **) ((char *)struct_ptr + offset) = MK_PSTRDUP(cmd->pool, "KerberosV5");
-       else if
-#endif /* KRB5 */
-#ifdef KRB4
-          (!strncasecmp(arg, "v4", 2))
-               *(char **) ((char *)struct_ptr + offset) = MK_PSTRDUP(cmd->pool, "KerberosV4");
-#endif /* KRB4 */
-       else if
-          (!strncasecmp(arg, "dualv5v4", 8))
-               *(char **) ((char *)struct_ptr + offset) = MK_PSTRDUP(cmd->pool, "KerberosDualV5V4");
-       else if
-          (!strncasecmp(arg, "dualv4v5", 8))
-               *(char **) ((char *)struct_ptr + offset) = MK_PSTRDUP(cmd->pool, "KerberosDualV4V5");
-#if defined(KRB4) && defined(KRB5)
-#endif /* KRB4 && KRB5 */
-       else
-               return "AuthKerberos must be V5, V4, DualV4V5, or DualV5V4.";
-       return NULL;
+   int ret;
+   krb5_context kcontext;
+   krb5_principal server, client;
+   krb5_timestamp now;
+   krb5_creds my_creds;
+   krb5_flags options = 0;
+   krb5_principal me = NULL;
+   krb5_data tgtname = {
+      0,
+      KRB5_TGS_NAME_SIZE,
+      KRB5_TGS_NAME
+   };
+
+   memset((char *)&my_creds, 0, sizeof(my_creds));
+   my_creds.client = principal;
+
+   if (krb5_build_principal_ext(kcontext, &server,
+                               krb5_princ_realm(kcontext, me)->length,
+                               krb5_princ_realm(kcontext, me)->data,
+                               tgtname.length, tgtname.data,
+                               krb5_princ_realm(kcontext, me)->length,
+                               krb5_princ_realm(kcontext, me)->data,
+                               0)) {
+       return ret;
+   }
+
+   my_creds.server = server;
+   if (krb5_timeofday(kcontext, &now))
+       return -1;
+
+   my_creds.times.starttime = 0;
+   /* XXX
+   my_creds.times.endtime = now + lifetime;
+   my_creds.times.renew_till = now + renewal;
+   */
+
+   ret = krb5_get_in_tkt_with_password(kcontext, options, 0, NULL, 0,
+                                      password, ccache, &my_creds, 0);
+   if (ret) {
+       return ret;
+   }
+
+   return 0;
 }
-
-
+#endif
 
 
 /*************************************************************************** 
- Auth Configuration Commands
+ Username/Password Validation
  ***************************************************************************/
-#ifdef APXS1
-command_rec kerb_auth_cmds[] = {
-       {
-               "AuthKerberos",
-               kerb_set_type_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_auth_type),
-               OR_AUTHCFG,
-               TAKE1,
-               "Permit Kerberos auth without AuthType requirement."
-       },
-
-#ifdef KRB4
-       {
-               "Krb4Srvtab",
-               ap_set_file_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_4_srvtab),
-               RSRC_CONF & ACCESS_CONF,
-               TAKE1,
-               "Location of Kerberos V4 srvtab file."
-       },
-#endif /* KRB4 */
-
-#ifdef KRB5
-       {
-               "Krb5Keytab",
-               ap_set_file_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_5_keytab),
-               RSRC_CONF & ACCESS_CONF,
-               TAKE1,
-               "Location of Kerberos V5 keytab file."
-       },
-#endif /* KRB5 */
-
-       {
-               "KrbAuthoritative",
-               ap_set_flag_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_authoritative),
-               OR_AUTHCFG,
-               FLAG,
-               "Refuse to pass request down to lower modules."
-       },
-
-       {
-               "KrbDefaultRealm",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_default_realm),
-               OR_AUTHCFG,
-               TAKE1,
-               "Default realm to authenticate users against."
-       },
-
-       {
-               "KrbFailStatus",
-               kerb_set_fail_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_fail_status),
-               OR_AUTHCFG,
-               TAKE1,
-               "If auth fails, return status set here."
-       },
-
-       {
-               "KrbForceInstance",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_force_instance),
-               OR_AUTHCFG,
-               TAKE1,
-               "Force authentication against an instance specified here."
-       },
-
 #ifdef KRB5
-       {
-               "KrbForwardable",
-               ap_set_flag_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_forwardable),
-               OR_AUTHCFG,
-               FLAG,
-               "Credentials retrieved will be flagged as forwardable."
-       },
-#endif /* KRB5 */
+static void
+krb5_cache_cleanup(void *data)
+{
+   krb5_context context;
+   krb5_ccache  cache;
+   krb5_error_code problem;
+   char *cache_name = (char *) data;
+
+   problem = krb5_init_context(&context);
+   if (problem) {
+      ap_log_error(APLOG_MARK, APLOG_ERR, NULL, "krb5_init_context() failed");
+      return;
+   }
+
+   problem = krb5_cc_resolve(context, cache_name, &cache);
+   if (problem) {
+      ap_log_error(APLOG_MARK, APLOG_ERR, NULL, 
+                   "krb5_cc_resolve() failed (%s: %s)",
+                  cache_name, krb5_get_err_text(context, problem)); 
+      return;
+   }
+
+   krb5_cc_destroy(context, cache);
+   krb5_free_context(context);
+}
 
-       {
-               "KrbLifetime",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_lifetime),
-               OR_AUTHCFG,
-               TAKE1,
-               "Lifetime of tickets retrieved."
-       },
+static int
+create_krb5_ccache(krb5_context kcontext,
+                  request_rec *r,
+                  kerb_auth_config *conf,
+                  krb5_principal princ,
+                  krb5_ccache *ccache)
+{
+       char *c, ccname[MAX_STRING_LEN];
+       krb5_error_code problem;
+       char errstr[1024];
+       int ret;
+       krb5_ccache tmp_ccache = NULL;
 
-#ifdef KRB5
-       {
-               "KrbRenewable",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_renewable),
-               OR_AUTHCFG,
-               TAKE1,
-               "Credentials retrieved will be renewable for this length."
-       },
-#endif /* KRB5 */
+       snprintf(ccname, sizeof(ccname), "FILE:%s/k5cc_ap_%s",
+               conf->krb_tmp_dir ? conf->krb_tmp_dir : "/tmp",
+               MK_USER);
 
-       {
-               "KrbSaveCredentials",
-               ap_set_flag_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_save_credentials),
-               OR_AUTHCFG,
-               FLAG,
-               "Save and store credentials/tickets retrieved during auth."
-       },
-
-       {
-               "KrbSaveTickets",
-               ap_set_flag_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_save_credentials),
-               OR_AUTHCFG,
-               FLAG,
-               "Alias for KrbSaveCredentials."
-       },
-
-       {
-               "KrbTmpdir",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_tmp_dir),
-               OR_AUTHCFG,
-               TAKE1,
-               "Path to store ticket files and such in."
-       },
-
-       { NULL }
-};
-#else
-#ifdef APXS2
-static const command_rec kerb_auth_cmds[] = {
-       AP_INIT_TAKE1(
-               "AuthKerberos",
-               kerb_set_type_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_auth_type),
-               OR_AUTHCFG,
-               "Permit Kerberos auth without AuthType requirement."
-       ),
+       for (c = ccname + strlen(conf->krb_tmp_dir ? conf->krb_tmp_dir :
+            "/tmp") + 1; *c; c++) {
+               if (*c == '/')
+                       *c = '.';
+       }
 
-#ifdef KRB4
-       AP_INIT_TAKE1(
-               "Krb4Srvtab",
-               ap_set_file_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_4_srvtab),
-               RSRC_CONF & ACCESS_CONF,
-               "Location of Kerberos V4 srvtab file."
-       ),
-#endif /* KRB4 */
+#if 0
+       /* not sure what's the purpose of this call here */
+       problem = krb5_cc_set_default_name(kcontext, ccname);
+        if (problem) {
+                snprintf(errstr, sizeof(errstr),
+                           "krb5_cc_set_default_name() failed: %s",
+                           krb5_get_err_text(kcontext, problem));
+                ap_log_reason (errstr, r->uri, r);
+                ret = SERVER_ERROR;
+                goto end;
+          }
+
+#endif
+
+#if 0
+       /* XXX Dan: Why is this done? Cleanup? But the file would not be
+         * accessible from another processes (CGI) */
+        unlink(ccname+strlen("FILE:"));
+#endif
+
+       problem = krb5_cc_resolve(kcontext, ccname, &tmp_ccache);
+       if (problem) {
+               snprintf(errstr, sizeof(errstr),
+                        "krb5_cc_resolve() failed: %s",
+                        krb5_get_err_text(kcontext, problem));
+               ap_log_reason (errstr, r->uri, r);
+               ret = SERVER_ERROR;
+               goto end;
+       }
 
-#ifdef KRB5
-       AP_INIT_TAKE1(
-               "Krb5Keytab",
-               ap_set_file_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_5_keytab),
-               RSRC_CONF & ACCESS_CONF,
-               "Location of Kerberos V5 keytab file."
-       ),
-#endif /* KRB5 */
+       problem = krb5_cc_initialize(kcontext, tmp_ccache, princ);
+       if (problem) {
+               snprintf(errstr, sizeof(errstr),
+                        "krb5_cc_initialize() failed: %s",
+                        krb5_get_err_text(kcontext, problem));
+               ap_log_reason (errstr, r->uri, r);
+               ret = SERVER_ERROR;
+               goto end;
+       }
 
-       AP_INIT_FLAG(
-               "KrbAuthoritative",
-               ap_set_flag_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_authoritative),
-               OR_AUTHCFG,
-               "Refuse to pass request down to lower modules."
-       ),
-
-       AP_INIT_TAKE1(
-               "KrbDefaultRealm",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_default_realm),
-               OR_AUTHCFG,
-               "Default realm to authenticate users against."
-       ),
-
-       AP_INIT_TAKE1(
-               "KrbFailStatus",
-               kerb_set_fail_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_fail_status),
-               OR_AUTHCFG,
-               "If auth fails, return status set here."
-       ),
-
-       AP_INIT_TAKE1(
-               "KrbForceInstance",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_force_instance),
-               OR_AUTHCFG,
-               "Force authentication against an instance specified here."
-       ),
+       ap_table_setn(r->subprocess_env, "KRB5CCNAME", ccname);
+       ap_register_cleanup(r->pool, ccname,
+                           krb5_cache_cleanup, ap_null_cleanup);
 
-#ifdef KRB5
-       AP_INIT_FLAG(
-               "KrbForwardable",
-               ap_set_flag_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_forwardable),
-               OR_AUTHCFG,
-               "Credentials retrieved will be flagged as forwardable."
-       ),
-#endif /* KRB5 */
+       *ccache = tmp_ccache;
+       tmp_ccache = NULL;
 
-       AP_INIT_TAKE1(
-               "KrbLifetime",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_lifetime),
-               OR_AUTHCFG,
-               "Lifetime of tickets retrieved."
-       ),
+       ret = OK;
 
-#ifdef KRB5
-       AP_INIT_TAKE1(
-               "KrbRenewable",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_renewable),
-               OR_AUTHCFG,
-               "Credentials retrieved will be renewable for this length."
-       ),
-#endif /* KRB5 */
-
-       AP_INIT_FLAG(
-               "KrbSaveCredentials",
-               ap_set_flag_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_save_credentials),
-               OR_AUTHCFG,
-               "Save and store credentials/tickets retrieved during auth."
-       ),
-
-       AP_INIT_FLAG(
-               "KrbSaveTickets",
-               ap_set_flag_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_save_credentials),
-               OR_AUTHCFG,
-               "Alias for KrbSaveCredentials."
-       ),
-
-       AP_INIT_TAKE1(
-               "KrbTmpdir",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_tmp_dir),
-               OR_AUTHCFG,
-               "Path to store ticket files and such in."
-       ),
-
-       { NULL }
-};
-#endif /* APXS2 */
-#endif /* APXS1 */
+end:
+       if (tmp_ccache)
+          krb5_cc_destroy(kcontext, tmp_ccache);
 
+       return ret; /* XXX */
+}
 
+static int
+store_krb5_creds(krb5_context kcontext,
+                request_rec *r,
+                kerb_auth_config *conf,
+                krb5_ccache delegated_cred)
+{
+   char errstr[1024];
+   krb5_error_code problem;
+   krb5_principal princ;
+   krb5_ccache ccache;
+   int ret;
+
+   problem = krb5_cc_get_principal(kcontext, delegated_cred, &princ);
+   if (problem) {
+      snprintf(errstr, sizeof(errstr), "krb5_cc_get_principal() failed: %s",
+              krb5_get_err_text(kcontext, problem));
+      return SERVER_ERROR;
+   }
+
+   ret = create_krb5_ccache(kcontext, r, conf, princ, &ccache);
+   if (ret) {
+      krb5_free_principal(kcontext, princ);
+      return ret;
+   }
+
+   problem = krb5_cc_copy_cache(kcontext, delegated_cred, ccache);
+   krb5_free_principal(kcontext, princ);
+   if (problem) {
+      snprintf(errstr, sizeof(errstr), "krb5_cc_copy_cache() failed: %s",
+              krb5_get_err_text(kcontext, problem));
+      krb5_cc_destroy(kcontext, ccache);
+      return SERVER_ERROR;
+   }
+
+   krb5_cc_close(kcontext, ccache);
+   return OK;
+}
 
+int authenticate_user_krb5pwd(request_rec *r,
+                             kerb_auth_config *conf,
+                             const char *auth_line)
+{
+   const char      *sent_pw = NULL; 
+   const char      *realms = NULL;
+   krb5_context    kcontext;
+   krb5_error_code code;
+   krb5_principal  client = NULL;
+   krb5_ccache     ccache = NULL;
+   int             ret;
+
+   code = krb5_init_context(&kcontext);
+   if (code) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO, r,
+                   "Cannot initialize Kerberos5 context (%d)", code);
+      return SERVER_ERROR;
+   }
+
+   sent_pw = ap_uudecode(r->pool, auth_line);
+   r->connection->user = ap_getword (r->pool, &sent_pw, ':');
+   r->connection->ap_auth_type = "Basic";
+
+   /* do not allow user to override realm setting of server */
+   if (strchr(r->connection->user,'@')) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO, r,
+                  "specifying realm in user name is prohibited");
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   } 
+
+#ifdef HEIMDAL
+   code = krb5_cc_gen_new(kcontext, &krb5_mcc_ops, &ccache);
+#else
+   code = krb5_mcc_generate_new(kcontext, &ccache);
+#endif
+   if (code) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO, r, 
+                   "Cannot generate new ccache: %s",
+                   krb5_get_err_text(kcontext, code));
+      ret = SERVER_ERROR;
+      goto end;
+   }
+
+   realms = conf->krb_auth_realms;
+   do {
+      if (realms && krb5_set_default_realm(kcontext,
+                                          ap_getword_white(r->pool, &realms)))
+        continue;
+
+      code = krb5_parse_name(kcontext, r->connection->user, &client);
+      if (code)
+        continue;
+
+      code = krb5_verify_user(kcontext, client, ccache, sent_pw, 1, "khttp");
+      krb5_free_principal(kcontext, client);
+      if (code == 0)
+        break;
+
+      /* ap_getword_white() used above shifts the parameter, so it's not
+         needed to touch the realms variable */
+   } while (realms && *realms);
+
+   memset((char *)sent_pw, 0, strlen(sent_pw));
+
+   if (code) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO, r,
+                   "Verifying krb5 password failed: %s",
+                   krb5_get_err_text(kcontext, code));
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   }
+
+   if (conf->krb_save_credentials) {
+      ret = store_krb5_creds(kcontext, r, conf, ccache);
+      if (ret) /* Ignore error ?? */
+        goto end;
+   }
+
+   ret = OK;
+
+end:
+   if (client)
+      krb5_free_principal(kcontext, client);
+   if (ccache)
+      krb5_cc_destroy(kcontext, ccache);
+   krb5_free_context(kcontext);
+
+   return ret;
+}
+#endif /* KRB5 */
 
-/*************************************************************************** 
- Username/Password Validation
- ***************************************************************************/
-#ifdef KRB5
-int kerb5_password_validate(const char *user, const char *pass) {
+#ifdef KRB4
+int kerb4_password_validate(request_rec *r, const char *user, const char *pass)
+{
+       kerb_auth_config *conf =
+               (kerb_auth_config *)ap_get_module_config(r->per_dir_config,
+                                       &kerb_auth_module);
        int ret;
-       krb5_context kcontext;
-       krb5_principal server, me;
-       krb5_creds my_creds;
-       krb5_timestamp now;
-       krb5_deltat lifetime = 0;
-       krb5_data tgtname = {
-               0,
-               KRB5_TGS_NAME_SIZE,
-               KRB5_TGS_NAME
-       };
-
-       if (krb5_init_context(&kcontext))
+       int lifetime = DEFAULT_TKT_LIFE;
+       char *c, *tfname;
+       char *username = NULL;
+       char *instance = NULL;
+       char *realm = NULL;
+
+       username = (char *)ap_pstrdup(r->pool, user);
+       if (!username) {
                return 0;
+       }
 
-       memset((char *)&my_creds, 0, sizeof(my_creds));
-       if(krb5_parse_name(kcontext, user, &me))
-               return 0;
-       my_creds.client = me;
+       instance = strchr(username, '.');
+       if (instance) {
+               *instance++ = '\0';
+       }
+       else {
+               instance = "";
+       }
 
-       if (krb5_build_principal_ext(kcontext, &server,
-                               krb5_princ_realm(kcontext, me)->length,
-                               krb5_princ_realm(kcontext, me)->data,
-                               tgtname.length, tgtname.data,
-                               krb5_princ_realm(kcontext, me)->length,
-                               krb5_princ_realm(kcontext, me)->data,
-                               0)) {
-               return 0;
+       realm = strchr(username, '@');
+       if (realm) {
+               *realm++ = '\0';
+       }
+       else {
+               realm = "";
        }
-       my_creds.server = server;
-       if (krb5_timeofday(kcontext, &now))
-               return 0;
-       my_creds.times.starttime = 0;
-       my_creds.times.endtime = now + lifetime;
-       my_creds.times.renew_till = 0;
 
-       ret = krb5_get_in_tkt_with_password(kcontext, 0, 0, NULL, 0,
-                               pass, NULL, &my_creds, 0);
-       if (ret) {
-               return 0;
+       if (conf->krb_lifetime) {
+               lifetime = atoi(conf->krb_lifetime);
        }
 
-       krb5_free_cred_contents(kcontext, &my_creds);
+       if (conf->krb_force_instance) {
+               instance = conf->krb_force_instance;
+       }
 
-       return 1;
-}
-#endif /* KRB5 */
+       if (conf->krb_save_credentials) {
+               tfname = (char *)malloc(sizeof(char) * MAX_STRING_LEN);
+               sprintf(tfname, "%s/k5cc_ap_%s",
+                       conf->krb_tmp_dir ? conf->krb_tmp_dir : "/tmp",
+                       MK_USER);
 
-#ifdef KRB4
-int kerb4_password_validate(const char *user, const char *pass) {
-       int ret;
-       char realm[REALM_SZ];
+               if (!strcmp(instance, "")) {
+                       tfname = strcat(tfname, ".");
+                       tfname = strcat(tfname, instance);
+               }
 
-       ret = krb_get_lrealm(realm, 1);
-       if (ret != KSUCCESS)
-               return 0;
+               if (!strcmp(realm, "")) {
+                       tfname = strcat(tfname, ".");
+                       tfname = strcat(tfname, realm);
+               }
+
+               for (c = tfname + strlen(conf->krb_tmp_dir ? conf->krb_tmp_dir :
+                               "/tmp") + 1; *c; c++) {
+                       if (*c == '/')
+                               *c = '.';
+               }
+
+               krb_set_tkt_string(tfname);
+       }
+
+       if (!strcmp(realm, "")) {
+               realm = (char *)malloc(sizeof(char) * (REALM_SZ + 1));
+               ret = krb_get_lrealm(realm, 1);
+               if (ret != KSUCCESS)
+                       return 0;
+       }
 
-       ret = krb_get_pw_in_tkt((char *)user, "", realm, "krbtgt", realm,
-                                       DEFAULT_TKT_LIFE, (char *)pass);
+       ret = krb_get_pw_in_tkt((char *)user, instance, realm, "krbtgt", realm,
+                                       lifetime, (char *)pass);
        switch (ret) {
                case INTK_OK:
                case INTK_W_NOTALL:
@@ -499,141 +702,339 @@ int kerb4_password_validate(const char *user, const char *pass) {
 
 
 /*************************************************************************** 
User Authentication
GSSAPI Validation
  ***************************************************************************/
-int kerb_authenticate_user(request_rec *r) {
-       const char *name;               /* AuthName specified */
-       const char *type;               /* AuthType specified */
-       int KerberosV5 = 0;             /* Kerberos V5 check enabled */
-       int KerberosV4 = 0;             /* Kerberos V4 check enabled */
-       int KerberosV4first = 0;        /* Kerberos V4 check first */
-       const char *sent_pw;            /* Password sent by browser */
-       int res;                        /* Response holder */
-       int retcode;                    /* Return code holder */
-       const char *t;                  /* Decoded auth_line */
-       const char *authtype;           /* AuthType to send back to browser */
-       const char *auth_line = MK_TABLE_GET(r->headers_in,
-                                       (r->proxyreq == MK_PROXY)
-                                               ? "Proxy-Authorization"
-                                               : "Authorization");
-       kerb_auth_config *conf =
-               (kerb_auth_config *)ap_get_module_config(r->per_dir_config,
-                                       &kerb_auth_module);
+#ifdef GSSAPI
+static const char *
+get_gss_error(pool *p, OM_uint32 error_status, char *prefix)
+{
+   OM_uint32 maj_stat, min_stat;
+   OM_uint32 msg_ctx = 0;
+   gss_buffer_desc status_string;
+   char buf[1024];
+   size_t len;
+
+   snprintf(buf, sizeof(buf), "%s: ", prefix);
+   len = strlen(buf);
+   do {
+      maj_stat = gss_display_status (&min_stat,
+                                    error_status,
+                                    GSS_C_MECH_CODE,
+                                    GSS_C_NO_OID,
+                                    &msg_ctx,
+                                    &status_string);
+      if (sizeof(buf) > len + status_string.length + 1) {
+         sprintf(buf+len, "%s:", (char*) status_string.value);
+         len += status_string.length;
+      }
+      gss_release_buffer(&min_stat, &status_string);
+   } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);
+
+   return (ap_pstrdup(p, buf));
+}
 
-       type = ap_auth_type(r);
+static int
+get_gss_creds(request_rec *r,
+              kerb_auth_config *conf,
+             gss_cred_id_t *server_creds)
+{
+   int ret = 0;
+   gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
+   OM_uint32 major_status, minor_status;
+   gss_name_t server_name = GSS_C_NO_NAME;
+
+   if (conf->service_name) {
+      input_token.value = conf->service_name;
+      input_token.length = strlen(conf->service_name) + 1;
+   }
+   else {
+      input_token.value = "khttp";
+      input_token.length = 6;
+   }
+   major_status = gss_import_name(&minor_status, &input_token,
+                                 (conf->service_name) ? 
+                                      GSS_C_NT_USER_NAME : GSS_C_NT_HOSTBASED_SERVICE,
+                                 &server_name);
+   if (GSS_ERROR(major_status)) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, r,
+                   "%s", get_gss_error(r->pool, minor_status,
+                   "gss_import_name() failed"));
+      ret = SERVER_ERROR;
+      goto fail;
+   }
+   
+#ifdef KRB5
+   if (conf->krb_5_keytab)
+      setenv("KRB5_KTNAME", conf->krb_5_keytab, 1);
+#endif
 
-       if (type != NULL) {
+   major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
+                                  GSS_C_NO_OID_SET, GSS_C_ACCEPT,
+                                  server_creds, NULL, NULL);
 #ifdef KRB5
-               if ((strncasecmp(type, "KerberosV5", 10) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosV5", 10) == 0)) {
-                       KerberosV5 = 1;
-               }
-#endif /* KRB5 */
+   if (conf->krb_5_keytab)
+      unsetenv("KRB5_KTNAME");
+#endif
+   if (GSS_ERROR(major_status)) {
+      ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, r,
+                  "%s", get_gss_error(r->pool, minor_status,
+                                      "gss_acquire_cred() failed"));
+      ret = SERVER_ERROR;
+      goto fail;
+   }
+   
+   return 0;
+
+fail:
+   /* XXX cleanup */
+
+   return ret;
+}
 
-#ifdef KRB4
-               if ((strncasecmp(type, "KerberosV4", 10) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosV4", 10) == 0)) {
-                       KerberosV4 = 1;
-               }
-#endif /* KRB4 */
+static int
+authenticate_user_gss(request_rec *r,
+                     kerb_auth_config *conf,
+                     const char *auth_line)
+{
+  OM_uint32 major_status, minor_status, minor_status2;
+  gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
+  gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
+  const char *auth_param = NULL;
+  int ret;
+  gss_name_t client_name = GSS_C_NO_NAME;
+  gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
+
+  if (gss_connection == NULL) {
+     gss_connection = ap_pcalloc(r->connection->pool, sizeof(*gss_connection));
+     if (gss_connection == NULL) {
+       ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                     "ap_pcalloc() failed (not enough memory)");
+       ret = SERVER_ERROR;
+       goto end;
+     }
+     memset(gss_connection, 0, sizeof(*gss_connection));
+     ap_register_cleanup(r->connection->pool, gss_connection, cleanup_gss_connection, ap_null_cleanup);
+  }
+
+  if (gss_connection->server_creds == GSS_C_NO_CREDENTIAL) {
+     ret = get_gss_creds(r, conf, &gss_connection->server_creds);
+     if (ret)
+       goto end;
+  }
+
+  /* ap_getword() shifts parameter */
+  auth_param = ap_getword_white(r->pool, &auth_line);
+  if (auth_param == NULL) {
+     ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                  "No Authorization parameter in request from client");
+     ret = HTTP_UNAUTHORIZED;
+     goto end;
+  }
+
+  input_token.length = ap_base64decode_len(auth_param);
+  input_token.value = ap_pcalloc(r->connection->pool, input_token.length);
+  if (input_token.value == NULL) {
+     ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                  "ap_pcalloc() failed (not enough memory)");
+     ret = SERVER_ERROR;
+     goto end;
+  }
+  input_token.length = ap_base64decode(input_token.value, auth_param);
+
+  major_status = gss_accept_sec_context(&minor_status,
+                                       &gss_connection->context,
+                                       gss_connection->server_creds,
+                                       &input_token,
+                                       GSS_C_NO_CHANNEL_BINDINGS,
+                                       &client_name,
+                                       NULL,
+                                       &output_token,
+                                       NULL,
+                                       NULL,
+                                       &delegated_cred);
+  if (output_token.length) {
+     char *token = NULL;
+     size_t len;
+     
+     len = ap_base64encode_len(output_token.length);
+     token = ap_pcalloc(r->connection->pool, len + 1);
+     if (token == NULL) {
+       ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                    "ap_pcalloc() failed (not enough memory)");
+        ret = SERVER_ERROR;
+       gss_release_buffer(&minor_status2, &output_token);
+       goto end;
+     }
+     ap_base64encode(token, output_token.value, output_token.length);
+     token[len] = '\0';
+     ap_table_set(r->err_headers_out, "WWW-Authenticate",
+                 ap_pstrcat(r->pool, "GSS-Negotiate ", token, NULL));
+     gss_release_buffer(&minor_status2, &output_token);
+  }
+
+  if (GSS_ERROR(major_status)) {
+     ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                  "%s", get_gss_error(r->pool, minor_status,
+                                      "gss_accept_sec_context() failed"));
+     ret = HTTP_UNAUTHORIZED;
+     goto end;
+  }
+
+  if (major_status & GSS_S_CONTINUE_NEEDED) {
+     /* Some GSSAPI mechanism (eg GSI from Globus) may require multiple 
+      * iterations to establish authentication */
+     ret = HTTP_UNAUTHORIZED;
+     goto end;
+  }
+
+  major_status = gss_export_name(&minor_status, client_name, &output_token);
+  gss_release_name(&minor_status, &client_name); 
+  if (GSS_ERROR(major_status)) {
+    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                 "%s", get_gss_error(r->pool, minor_status, 
+                                     "gss_export_name() failed"));
+    ret = SERVER_ERROR;
+    goto end;
+  }
+
+  r->connection->ap_auth_type = "Negotiate";
+  r->connection->user = ap_pstrdup(r->pool, output_token.value);
+#if 0
+  /* If the user comes from a realm specified by configuration don't include
+      its realm name in the username so that the authorization routine could
+      work for both Password-based and Ticket-based authentication. It's
+      administrators responsibility to include only such realm that have
+      unified principal instances, i.e. if the same principal name occures in
+      multiple realms, it must be always assigned to a single user.
+  */    
+  p = strchr(r->connection->user, '@');
+  if (p != NULL) {
+     const char *realms = conf->gss_krb5_realms;
+
+     while (realms && *realms) {
+       if (strcmp(p+1, ap_getword_white(r->pool, &realms)) == 0) {
+          *p = '\0';
+          break;
+       }
+     }
+  }
+#endif
+
+  gss_release_buffer(&minor_status, &output_token);
+
+#if 0
+  /* This should be only done if afs token are requested or gss_save creds is 
+   * specified */
+  /* gss_export_cred() from the GGF GSS Extensions could be used */
+  if (delegated_cred != GSS_C_NO_CREDENTIAL &&
+      (conf->gss_save_creds || (conf->gss_krb5_cells && k_hasafs()))) {        
+     krb5_init_context(&krb_ctx);
+     do_afs_log(krb_ctx, r, delegated_cred->ccache, conf->gss_krb5_cells);
+     ret = store_krb5_creds(krb_ctx, r, conf, delegated_cred->ccache);
+     krb5_free_context(krb_ctx);
+     if (ret)
+       goto end;
+  }
+#endif
+  ret = OK;
+
+end:
+  if (delegated_cred)
+     gss_release_cred(&minor_status, &delegated_cred);
+
+  if (output_token.length) 
+     gss_release_buffer(&minor_status, &output_token);
+
+  if (client_name != GSS_C_NO_NAME)
+     gss_release_name(&minor_status, &client_name);
+
+  return ret;
+}
+#endif /* GSSAPI */
 
-#if defined(KRB5) && defined(KRB4)
-               if ((strncasecmp(type, "KerberosDualV5V4", 15) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosDualV5V4", 15) == 0)) {
-                       KerberosV5 = 1;
-                       KerberosV4 = 1;
-               }
 
-               if ((strncasecmp(type, "KerberosDualV4V5", 15) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosDualV4V5", 15) == 0)) {
-                       KerberosV5 = 1;
-                       KerberosV4 = 1;
-                       KerberosV4first = 1;
-               }
-#endif /* KRB5 && KRB4 */
-       }
+static void
+note_auth_failure(request_rec *r, const kerb_auth_config *conf)
+{
+   const char *auth_type = NULL;
+   const char *auth_name = NULL;
 
-       if (!KerberosV4 && !KerberosV5) {
-               if (conf->krb_authoritative) {
-                       return HTTP_UNAUTHORIZED;
-               }
-               else {
-                       return DECLINED;
-               }
-       }
+   /* get the type specified in .htaccess */
+   auth_type = ap_auth_type(r);
 
-       name = ap_auth_name(r);
-       if (!name) {
-               ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                               MK_RERROR_LEVEL "need AuthName: %s", r->uri);
-               return HTTP_INTERNAL_SERVER_ERROR;
-       }
+   /* get the user realm specified in .htaccess */
+   auth_name = ap_auth_name(r);
+
+   /* XXX should the WWW-Authenticate header be cleared first? */
+#ifdef KRB5
+   if (conf->krb_method_gssapi)
+      ap_table_add(r->err_headers_out, "WWW-Authenticate", "GSS-Negotiate ");
+#endif
+   if (auth_type && strncasecmp(auth_type, "KerberosV5", 10) == 0)
+      ap_table_add(r->err_headers_out, "WWW-Authenticate",
+                   ap_pstrcat(r->pool, "Basic realm=\"", auth_name, "\"", NULL));
+}
 
-       if (!auth_line) {
-               MK_TABLE_SET(r->err_headers_out, "WWW-Authenticate",
-                       ap_pstrcat(r->pool, "Basic realm=\"", name, "\"", NULL));
-               return HTTP_UNAUTHORIZED;
-       }
 
-       type = ap_getword_white(r->pool, &auth_line);
-       t = ap_pbase64decode(r->pool, auth_line);
-       MK_USER = ap_getword_nulls(r->pool, &t, ':');
-       MK_AUTH_TYPE = "Kerberos";
-       sent_pw = ap_getword_white(r->pool, &t);
 
-       retcode = DECLINED;
+/*************************************************************************** 
+ User Authentication
+ ***************************************************************************/
+int kerb_authenticate_user(request_rec *r)
+{
+   kerb_auth_config *conf = 
+      (kerb_auth_config *) ap_get_module_config(r->per_dir_config,
+                                               &kerb_auth_module);
+   const char *auth_type = NULL;
+   const char *auth_line = NULL;
+   const char *type = NULL;
+   int ret;
+
+   /* get the type specified in .htaccess */
+   type = ap_auth_type(r);
+
+   if (!conf->krb_auth_enable &&
+       (type == NULL || (strncasecmp(type, "Kerberos", 8) != 0)))
+      return DECLINED;
+
+   /* get what the user sent us in the HTTP header */
+   auth_line = MK_TABLE_GET(r->headers_in, "Authorization");
+   if (!auth_line) {
+      note_auth_failure(r, conf);
+      return HTTP_UNAUTHORIZED;
+   }
+   auth_type = ap_getword_white(r->pool, &auth_line);
+
+   ret = HTTP_UNAUTHORIZED;
+
+   /* XXX Support for AuthType=Kerberos */
 
 #ifdef KRB5
-       if (KerberosV5 && !KerberosV4first && retcode != OK) {
-               MK_AUTH_TYPE = "KerberosV5";
-               if (kerb5_password_validate(MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB5 */
+   if (conf->krb_method_gssapi &&
+       strcasecmp(auth_type, "GSS-Negotiate") == 0) {
+      ret = authenticate_user_gss(r, conf, auth_line);
+   } else if (conf->krb_method_k5pass &&
+             strcasecmp(auth_type, "Basic") == 0) {
+       ret = authenticate_user_krb5pwd(r, conf, auth_line);
+   }
+#endif
 
 #ifdef KRB4
-       if (KerberosV4 && retcode != OK) {
-               MK_AUTH_TYPE = "KerberosV4";
-               if (kerb4_password_validate(MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB4 */
+   if (ret == HTTP_UNAUTHORIZED && conf->krb_method_k4pass &&
+       strcasecmp(auth_type, "Basic") == 0)
+      ret = authenticate_user_krb4pwd(r, conf, auth_line);
+#endif
 
-#if defined(KRB5) && defined(KRB4)
-       if (KerberosV5 && KerberosV4first && retcode != OK) {
-               MK_AUTH_TYPE = "KerberosV5";
-               if (kerb5_password_validate(MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB5 && KRB4 */
+   if (ret == HTTP_UNAUTHORIZED)
+      note_auth_failure(r, conf);
 
-       if (conf->krb_authoritative && retcode == DECLINED) {
-               return HTTP_UNAUTHORIZED;
-       }
-       else {
-               return retcode;
-       }
+   return ret;
 }
 
 
-
-
-/*************************************************************************** 
- Access Verification
- ***************************************************************************/
-int kerb_check_user_access(request_rec *r) {
+#if 0
+int kerb_check_user_access(request_rec *r)
+{
        register int x;
        const char *t, *w;
        const MK_ARRAY_HEADER *reqs_arr = ap_requires(r);
@@ -662,6 +1063,7 @@ int kerb_check_user_access(request_rec *r) {
 
        return DECLINED;
 }
+#endif
 
 
 
@@ -673,7 +1075,7 @@ int kerb_check_user_access(request_rec *r) {
 module MODULE_VAR_EXPORT kerb_auth_module = {
        STANDARD_MODULE_STUFF,
        NULL,                           /*      module initializer            */
-       kerb_dir_config,                /*      per-directory config creator  */
+       kerb_dir_create_config,         /*      per-directory config creator  */
        NULL,                           /*      per-directory config merger   */
        NULL,                           /*      per-server    config creator  */
        NULL,                           /*      per-server    config merger   */
@@ -681,7 +1083,7 @@ module MODULE_VAR_EXPORT kerb_auth_module = {
        NULL,                           /* [ 9] content handlers              */
        NULL,                           /* [ 2] URI-to-filename translation   */
        kerb_authenticate_user,         /* [ 5] check/validate user_id        */
-       kerb_check_user_access,         /* [ 6] check user_id is valid *here* */
+       NULL,                           /* [ 6] check user_id is valid *here* */
        NULL,                           /* [ 4] check access by host address  */
        NULL,                           /* [ 7] MIME type checker/setter      */
        NULL,                           /* [ 8] fixups                        */
@@ -690,31 +1092,21 @@ module MODULE_VAR_EXPORT kerb_auth_module = {
        NULL,                           /*      process initialization        */
        NULL,                           /*      process exit/cleanup          */
        NULL                            /* [ 1] post read_request handling    */
-#ifdef EAPI
-       ,                               /*            EAPI Additions          */
-       NULL,                           /* EAPI add module                    */
-       NULL,                           /* EAPI remove module                 */
-       NULL,                           /* EAPI rewrite command               */
-       NULL                            /* EAPI new connection                */
-#endif /* EAPI */
 };
 #else
-#ifdef APXS2
 void kerb_register_hooks(apr_pool_t *p)
 {
-       ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
-       ap_hook_access_checker(kerb_check_user_access, NULL, NULL, APR_HOOK_MIDDLE);
+   ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 module AP_MODULE_DECLARE_DATA kerb_auth_module =
 {
-       STANDARD20_MODULE_STUFF,
-       kerb_dir_config,                /* create per-dir    conf structures  */
-       NULL,                           /* merge  per-dir    conf structures  */
-       NULL,                           /* create per-server conf structures  */
-       NULL,                           /* merge  per-server conf structures  */
-       kerb_auth_cmds,                 /* table of configuration directives  */
-       kerb_register_hooks             /* register hooks                     */
+   STANDARD20_MODULE_STUFF,
+   kerb_dir_create_config,     /* create per-dir    conf structures  */
+   NULL,                       /* merge  per-dir    conf structures  */
+   NULL,                       /* create per-server conf structures  */
+   NULL,                       /* merge  per-server conf structures  */
+   kerb_auth_cmds,             /* table of configuration directives  */
+   kerb_register_hooks         /* register hooks                     */
 };
-#endif /* APXS2 */
-#endif /* APXS1 */
+#endif