Better handling of includes
[mod_auth_kerb.cvs/.git] / src / mod_auth_kerb.c
index 2c66e8d..91c35ac 100644 (file)
@@ -1,20 +1,78 @@
-/*************************************************************************** 
- Included Headers And Module Declaration
- ***************************************************************************/
-#ifdef APXS1
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-module kerb_auth_module;
-#else
-#ifdef APXS2
+/*
+ * Daniel Kouril <kouril@users.sourceforge.org>
+ *
+ * Source and Documentation can be found at:
+ * http://modauthkerb.sourceforge.net/
+ *
+ * Based on work by
+ *   James E. Robinson, III <james@ncstate.net>
+ *   Daniel Henninger <daniel@ncsu.edu>
+ */
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+#ident "$Id$"
+
+#ifndef APXS1
+#include "ap_compat.h"
 #include "apr_strings.h"
-#include "apr_lib.h"
-#include "ap_config.h"
+#endif
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -22,20 +80,31 @@ module kerb_auth_module;
 #include "http_protocol.h"
 #include "http_request.h"
 
-module AP_MODULE_DECLARE_DATA kerb_auth_module;
-#endif /* APXS2 */
-#endif /* APXS1 */
-
 #ifdef KRB5
 #include <krb5.h>
+#include <gssapi.h>
+#ifndef HEIMDAL
+#  include <gssapi_generic.h>
+#  define GSS_C_NT_USER_NAME gss_nt_user_name
+#  define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#  define krb5_get_err_text(context,code) error_message(code)
+#endif
 #endif /* KRB5 */
 
 #ifdef KRB4
+/*Prevent warning about closesocket redefinition (Apache's ap_config.h and 
+ * MIT Kerberos' port-sockets.h both define it as close) */
+#ifdef closesocket
+#  undef closesocket
+#endif
 #include <krb.h>
 #endif /* KRB4 */
 
-
-
+#ifdef APXS1
+module auth_kerb_module;
+#else
+module AP_MODULE_DECLARE_DATA auth_kerb_module;
+#endif
 
 /*************************************************************************** 
  Macros To Ease Compatibility
@@ -46,747 +115,953 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module;
 #define MK_TABLE_SET ap_table_set
 #define MK_TABLE_TYPE table
 #define MK_PSTRDUP ap_pstrdup
-#define MK_PROXY STD_PROXY
 #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_USER r->user
 #define MK_AUTH_TYPE r->ap_auth_type
 #define MK_ARRAY_HEADER apr_array_header_t
-#endif /* APXS2 */
 #endif /* APXS1 */
 
 
-
-
 /*************************************************************************** 
  Auth Configuration Structure
  ***************************************************************************/
 typedef struct {
-       char *krb_auth_type;
-#ifdef KRB4
-       char *krb_4_srvtab;
-#endif /* KRB4 */
+       char *krb_auth_realms;
+       int krb_save_credentials;
 #ifdef KRB5
        char *krb_5_keytab;
-#endif /* KRB5 */
-       int krb_authoritative;
-       char *krb_default_realm;
-       int krb_fail_status;
-       char *krb_force_instance;
-#ifdef KRB5
-       int krb_forwardable;
-#endif /* KRB5 */
-       char *krb_lifetime;
-#ifdef KRB5
-       char *krb_renewable;
-#endif /* KRB5 */
-       int krb_save_credentials;
-       char *krb_tmp_dir;
+       int krb_method_gssapi;
+       int krb_method_k5pass;
+#endif
+#ifdef KRB4
+       char *krb_4_srvtab;
+       int krb_method_k4pass;
+#endif
 } kerb_auth_config;
 
+static const char*
+krb5_save_realms(cmd_parms *cmd, kerb_auth_config *sec, char *arg);
 
+#ifdef APXS1
+#define command(name, func, var, type, usage)          \
+  { name, func,                                        \
+    (void*)XtOffsetOf(kerb_auth_config, var),          \
+    OR_AUTHCFG, type, usage }
+#else
+#define command(name, func, var, type, usage)          \
+  AP_INIT_ ## type (name, func,                        \
+       (void*)APR_XtOffsetOf(kerb_auth_config, var),   \
+       OR_AUTHCFG, usage)
+#endif
 
+static const command_rec kerb_auth_cmds[] = {
+   command("KrbAuthRealms", krb5_save_realms, krb_auth_realms,
+     RAW_ARGS, "Realms to attempt authentication against (can be multiple)."),
 
-/*************************************************************************** 
- Auth Configuration Initialization
- ***************************************************************************/
-static void *kerb_dir_config(MK_POOL *p, char *d)
-{
-       static void *rec;
-       rec = (void *) ap_pcalloc(p, sizeof(kerb_auth_config));
-       ((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");
-       return rec;
-}
+   command("KrbAuthRealm", krb5_save_realms, krb_auth_realms,
+     RAW_ARGS, "Alias for KrbAuthRealms."),
+
+   command("KrbSaveCredentials", ap_set_flag_slot, krb_save_credentials,
+     FLAG, "Save and store credentials/tickets retrieved during auth."),
+
+#ifdef KRB5
+   command("Krb5Keytab", ap_set_file_slot, krb_5_keytab,
+     TAKE1, "Location of Kerberos V5 keytab file."),
+
+   command("KrbMethodNegotiate", ap_set_flag_slot, krb_method_gssapi,
+     FLAG, "Enable Negotiate authentication method."),
+
+   command("KrbMethodK5Pass", ap_set_flag_slot, krb_method_k5pass,
+     FLAG, "Enable Kerberos V5 password authentication."),
+#endif 
 
+#ifdef KRB4
+   command("Krb4Srvtab", ap_set_file_slot, krb_4_srvtab,
+     TAKE1, "Location of Kerberos V4 srvtab file."),
+
+   command("KrbMethodK4Pass", ap_set_flag_slot, krb_method_k4pass,
+     FLAG, "Enable Kerberos V4 password authentication."),
+#endif
 
+   { NULL }
+};
+
+#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;
+#endif
 
 
 /*************************************************************************** 
- Auth Configuration Parsers
+ Auth Configuration Initialization
  ***************************************************************************/
-static const char *kerb_set_fail_slot(cmd_parms *cmd, void *struct_ptr,
-                                       const char *arg)
+static void *kerb_dir_create_config(MK_POOL *p, char *d)
 {
-       int offset = (int) (long) cmd->info;
-       if (!strncasecmp(arg, "unauthorized", 12))
-               *(int *) ((char *)struct_ptr + offset) = HTTP_UNAUTHORIZED;
-       else if (!strncasecmp(arg, "forbidden", 9))
-               *(int *) ((char *)struct_ptr + offset) = HTTP_FORBIDDEN;
-       else if (!strncasecmp(arg, "declined", 8))
-               *(int *) ((char *)struct_ptr + offset) = DECLINED;
-       else
-               return "KrbAuthFailStatus must be Forbidden, Unauthorized, or Declined.";
-       return NULL;
-}
+       kerb_auth_config *rec;
 
-/* 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)
-{
-       int offset = (int) (long) cmd->info;
-       if
+       rec = (kerb_auth_config *) ap_pcalloc(p, sizeof(kerb_auth_config));
 #ifdef KRB5
-          (!strncasecmp(arg, "v5", 2))
-               *(char **) ((char *)struct_ptr + offset) = MK_PSTRDUP(cmd->pool, "KerberosV5");
-       else if
-#endif /* KRB5 */
+       ((kerb_auth_config *)rec)->krb_method_k5pass = 1;
+       ((kerb_auth_config *)rec)->krb_method_gssapi = 1;
+#endif
 #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;
+       ((kerb_auth_config *)rec)->krb_method_k4pass = 1;
+#endif
+       return rec;
 }
 
+static const char*
+krb5_save_realms(cmd_parms *cmd, kerb_auth_config *sec, char *arg)
+{
+   sec->krb_auth_realms= ap_pstrdup(cmd->pool, arg);
+   return NULL;
+}
 
+void log_rerror(const char *file, int line, int level, int status,
+                const request_rec *r, const char *fmt, ...)
+{
+   char errstr[1024];
+   va_list ap;
 
+   va_start(ap, fmt);
+   vsnprintf(errstr, sizeof(errstr), fmt, ap);
+   va_end(ap);
 
-/*************************************************************************** 
- Auth Configuration Commands
- ***************************************************************************/
 #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."
-       },
+   ap_log_rerror(file, line, level, r, "%s", errstr);
+#else
+   ap_log_rerror(file, line, level, status, r, "%s", errstr);
+#endif
+}
 
 #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 */
+/*************************************************************************** 
+ Username/Password Validation for Krb4
+ ***************************************************************************/
+static int
+verify_krb4_user(request_rec *r, char *name, char *instance, char *realm,
+                char *password, char *linstance, char *srvtab)
+{
+   int ret;
+   char *phost;
+   unsigned long addr;
+   struct hostent *hp;
+   const char *hostname;
+   KTEXT_ST ticket;
+   AUTH_DAT authdata;
+   char lrealm[REALM_SZ];
+
+   ret = krb_get_pw_in_tkt(name, instance, realm, "krbtgt", realm, 
+                          DEFAULT_TKT_LIFE, password);
+   if (ret)
+      /* log(krb_err_txt[ret]) */
+      return ret;
+
+   hostname = ap_get_server_name(r);
+
+   hp = gethostbyname(hostname);
+   if (hp == NULL) {
+      dest_tkt();
+      return h_errno;
+   }
+   memcpy(&addr, hp->h_addr, sizeof(addr));
+
+   phost = krb_get_phost((char *)hostname);
+
+   krb_get_lrealm(lrealm, 1);
+
+   ret = krb_mk_req(&ticket, linstance, phost, lrealm, 0);
+   if (ret) {
+      dest_tkt();
+      return ret;
+   }
+
+   ret = krb_rd_req(&ticket, linstance, phost, addr, &authdata, srvtab);
+   if (ret)
+      dest_tkt();
+
+   return ret;
+}
 
-#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 */
+static int
+krb4_cache_cleanup(void *data)
+{
+   char *tkt_file = (char *) data;
+   
+   krb_set_tkt_string(tkt_file);
+   dest_tkt();
+   return OK;
+}
 
-       {
-               "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."
-       },
+static int 
+authenticate_user_krb4pwd(request_rec *r,
+                         kerb_auth_config *conf,
+                         const char *auth_line)
+{
+   int ret;
+   const char *sent_pw;
+   const char *sent_name;
+   char *sent_instance;
+   char tkt_file[32];
+   char *tkt_file_p = NULL;
+   int fd;
+   const char *realms;
+   const char *realm;
+   char *user;
+   char lrealm[REALM_SZ];
+
+   sent_pw = ap_pbase64decode(r->pool, auth_line);
+   sent_name = ap_getword (r->pool, &sent_pw, ':');
+
+   /* do not allow user to override realm setting of server */
+   if (strchr(sent_name, '@')) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "specifying realm in user name is prohibited");
+      return HTTP_UNAUTHORIZED;
+   }
+
+   sent_instance = strchr(sent_name, '.');
+   if (sent_instance)
+      *sent_instance++ = '\0'; 
+
+   snprintf(tkt_file, sizeof(tkt_file), "/tmp/apache_tkt_XXXXXX");
+   fd = mkstemp(tkt_file);
+   if (fd < 0) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Cannot create krb4 ccache: mkstemp() failed: %s",
+                strerror(errno));
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   tkt_file_p = ap_pstrdup(r->pool, tkt_file);
+   ap_register_cleanup(r->pool, tkt_file_p,
+                      krb4_cache_cleanup, ap_null_cleanup);
+
+   krb_set_tkt_string(tkt_file);
+
+   realms = conf->krb_auth_realms;
+   do {
+      memset(lrealm, 0, sizeof(lrealm));
+      realm = NULL;
+      if (realms)
+        realm = ap_getword_white(r->pool, &realms);
+
+      if (realm == NULL) {
+        ret = krb_get_lrealm(lrealm, 1);
+        realm = lrealm;
+      }
+      if (realm == NULL || *realm == '\0')
+        break;
+
+      ret = verify_krb4_user(r, (char *)sent_name, 
+                            (sent_instance) ? sent_instance : "",
+                            (char *)realm, (char *)sent_pw, "khttp",
+                            conf->krb_4_srvtab);
+      if (ret == 0)
+        break;
+   } while (realms && *realms);
+
+   if (ret) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Verifying krb4 password failed (%d)", ret);
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   }
+
+   user = ap_pstrdup(r->pool, sent_name);
+   if (sent_instance)
+      user = ap_pstrcat(r->pool, user, ".", sent_instance, NULL);
+   user = ap_pstrcat(r->pool, user, "@", realm, NULL);
+
+   MK_USER = user;
+   MK_AUTH_TYPE = "Basic";
+   ap_table_setn(r->subprocess_env, "KRBTKFILE", tkt_file_p);
+
+   if (!conf->krb_save_credentials)
+      krb4_cache_cleanup(tkt_file);
+
+end:
+   if (ret)
+      krb4_cache_cleanup(tkt_file);
+   close(fd);
+   tf_close();
+
+   return ret;
+}
+#endif /* KRB4 */
 
 #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 */
+/*************************************************************************** 
+ Username/Password Validation for Krb5
+ ***************************************************************************/
+/* Inspired by krb5_verify_user from Heimdal */
+static krb5_error_code
+verify_krb5_user(request_rec *r, krb5_context context, krb5_principal principal,
+                krb5_ccache ccache, const char *password, const char *service,
+                krb5_keytab keytab)
+{
+   krb5_creds creds;
+   krb5_principal server = NULL;
+   krb5_error_code ret;
+   krb5_verify_init_creds_opt opt;
+
+   memset(&creds, 0, sizeof(creds));
+
+   ret = krb5_get_init_creds_password(context, &creds, principal, 
+                                     (char *)password, krb5_prompter_posix,
+                                     NULL, 0, NULL, NULL);
+   if (ret)
+      return ret;
+
+   ret = krb5_sname_to_principal(context, ap_get_server_name(r), service, 
+                                KRB5_NT_SRV_HST, &server);
+   if (ret)
+      goto end;
+
+   krb5_verify_init_creds_opt_init(&opt);
+   krb5_verify_init_creds_opt_set_ap_req_nofail(&opt, 1);
+
+   ret = krb5_verify_init_creds(context, &creds, server, keytab, NULL, &opt);
+   if (ret)
+      goto end;
+
+   if (ccache) {
+      ret = krb5_cc_initialize(context, ccache, principal);
+      if (ret == 0)
+        ret = krb5_cc_store_cred(context, ccache, &creds);
+   }
+
+end:
+   krb5_free_cred_contents(context, &creds);
+   if (server)
+      krb5_free_principal(context, server);
+   return ret;
+}
 
-       {
-               "KrbLifetime",
-               ap_set_string_slot,
-               (void*)XtOffsetOf(kerb_auth_config, krb_lifetime),
-               OR_AUTHCFG,
-               TAKE1,
-               "Lifetime of tickets retrieved."
-       },
+static int
+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, 0, NULL, "krb5_init_context() failed"); */
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   problem = krb5_cc_resolve(context, cache_name, &cache);
+   if (problem) {
+      /* log_error(APLOG_MARK, APLOG_ERR, 0, NULL, 
+                "krb5_cc_resolve() failed (%s: %s)",
+               cache_name, krb5_get_err_text(context, problem)); */
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   krb5_cc_destroy(context, cache);
+   krb5_free_context(context);
+   return OK;
+}
 
-#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 */
+static int
+create_krb5_ccache(krb5_context kcontext,
+                  request_rec *r,
+                  kerb_auth_config *conf,
+                  krb5_principal princ,
+                  krb5_ccache *ccache)
+{
+   char *ccname;
+   krb5_error_code problem;
+   int ret;
+   krb5_ccache tmp_ccache = NULL;
 
-       {
-               "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),
-               RSRC_CONF & ACCESS_CONF,
-               TAKE1,
-               "Path to store ticket files and such in."
-       },
-
-       { NULL }
-};
+#ifdef HEIMDAL
+   problem = krb5_cc_gen_new(kcontext, &krb5_fcc_ops, &tmp_ccache);
 #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."
-       ),
+   problem = krb5_fcc_generate_new(kcontext, &tmp_ccache);
+   /* krb5_fcc_generate_new() doesn't set KRB5_TC_OPENCLOSE, which makes 
+      krb5_cc_initialize() fail */
+   krb5_fcc_set_flags(kcontext, tmp_ccache, KRB5_TC_OPENCLOSE);
+#endif
+   if (problem) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Cannot create file for new krb5 ccache: %s",
+                krb5_get_err_text(kcontext, problem));
+      ret = HTTP_INTERNAL_SERVER_ERROR;
+      goto end;
+   }
+
+   ccname = ap_pstrdup(r->pool, krb5_cc_get_name(kcontext, tmp_ccache));
+
+   problem = krb5_cc_initialize(kcontext, tmp_ccache, princ);
+   if (problem) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Cannot initialize krb5 ccache %s: krb5_cc_initialize() failed: %s",
+                ccname, krb5_get_err_text(kcontext, problem));
+      ret = HTTP_INTERNAL_SERVER_ERROR;
+      goto end;
+   }
+
+   ap_table_setn(r->subprocess_env, "KRB5CCNAME", ccname);
+   ap_register_cleanup(r->pool, ccname,
+                      krb5_cache_cleanup, ap_null_cleanup);
+
+   *ccache = tmp_ccache;
+   tmp_ccache = NULL;
+
+   ret = OK;
+
+end:
+   if (tmp_ccache)
+      krb5_cc_destroy(kcontext, tmp_ccache);
+
+   return ret;
+}
 
-#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 */
+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 HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   ret = create_krb5_ccache(kcontext, r, conf, princ, &ccache);
+   if (ret) {
+      krb5_free_principal(kcontext, princ);
+      return ret;
+   }
+
+#ifdef HEIMDAL
+   problem = krb5_cc_copy_cache(kcontext, delegated_cred, ccache);
+#else
+   problem = krb5_cc_copy_creds(kcontext, delegated_cred, ccache);
+#endif
+   krb5_free_principal(kcontext, princ);
+   if (problem) {
+      snprintf(errstr, sizeof(errstr), "Failed to store credentials: %s",
+              krb5_get_err_text(kcontext, problem));
+      krb5_cc_destroy(kcontext, ccache);
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   krb5_cc_close(kcontext, ccache);
+   return OK;
+}
 
-#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 */
 
-       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."
-       ),
+int authenticate_user_krb5pwd(request_rec *r,
+                             kerb_auth_config *conf,
+                             const char *auth_line)
+{
+   const char      *sent_pw = NULL; 
+   const char      *sent_name = NULL;
+   const char      *realms = NULL;
+   krb5_context    kcontext = NULL;
+   krb5_error_code code;
+   krb5_principal  client = NULL;
+   krb5_ccache     ccache = NULL;
+   krb5_keytab     keytab = NULL;
+   int             ret;
+   char *name = NULL;
+
+   code = krb5_init_context(&kcontext);
+   if (code) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Cannot initialize Kerberos5 context (%d)", code);
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   sent_pw = ap_pbase64decode(r->pool, auth_line);
+   sent_name = ap_getword (r->pool, &sent_pw, ':');
+   /* do not allow user to override realm setting of server */
+   if (strchr(sent_name, '@')) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, 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) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
+                "Cannot generate new ccache: %s",
+                krb5_get_err_text(kcontext, code));
+      ret = HTTP_INTERNAL_SERVER_ERROR;
+      goto end;
+   }
+
+   if (conf->krb_5_keytab)
+      krb5_kt_resolve(kcontext, conf->krb_5_keytab, &keytab);
+      /* setenv("KRB5_KTNAME", conf->krb_5_keytab, 1); */
+
+   realms = conf->krb_auth_realms;
+   do {
+      if (realms && (code = krb5_set_default_realm(kcontext,
+                                          ap_getword_white(r->pool, &realms))))
+        continue;
+
+      if (client) {
+        krb5_free_principal(kcontext, client);
+        client = NULL;
+      }
+      code = krb5_parse_name(kcontext, sent_name, &client);
+      if (code)
+        continue;
+
+      code = verify_krb5_user(r, kcontext, client, ccache, sent_pw, "khttp",
+                             keytab);
+      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) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "Verifying krb5 password failed: %s",
+                krb5_get_err_text(kcontext, code));
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   }
+
+   code = krb5_unparse_name(kcontext, client, &name);
+   if (code) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "krb5_unparse_name() failed: %s",
+                krb5_get_err_text(kcontext, code));
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   }
+   MK_USER = ap_pstrdup (r->pool, name);
+   MK_AUTH_TYPE = "Basic";
+   free(name);
+
+   if (conf->krb_save_credentials)
+      store_krb5_creds(kcontext, r, conf, ccache);
+
+   ret = OK;
+
+end:
+   if (client)
+      krb5_free_principal(kcontext, client);
+   if (ccache)
+      krb5_cc_destroy(kcontext, ccache);
+   if (keytab)
+      krb5_kt_close(kcontext, keytab);
+   krb5_free_context(kcontext);
+
+   return ret;
+}
 
-#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 */
+/*********************************************************************
+ * GSSAPI Authentication
+ ********************************************************************/
 
-       AP_INIT_TAKE1(
-               "KrbLifetime",
-               ap_set_string_slot,
-               (void*)APR_XtOffsetOf(kerb_auth_config, krb_lifetime),
-               OR_AUTHCFG,
-               "Lifetime of tickets retrieved."
-       ),
+static const char *
+get_gss_error(MK_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));
+}
 
-#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 */
+static int
+cleanup_gss_connection(void *data)
+{
+   OM_uint32 minor_status;
+   gss_connection_t *gss_conn = (gss_connection_t *)data;
 
-       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),
-               RSRC_CONF & ACCESS_CONF,
-               "Path to store ticket files and such in."
-       ),
-
-       { NULL }
-};
-#endif /* APXS2 */
-#endif /* APXS1 */
+   if (data == NULL)
+      return OK;
+   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);
 
+   gss_connection = NULL;
 
+   return OK;
+}
 
+static int
+store_gss_creds(request_rec *r, kerb_auth_config *conf, char *princ_name,
+                gss_cred_id_t delegated_cred)
+{
+   OM_uint32 maj_stat, min_stat;
+   krb5_principal princ = NULL;
+   krb5_ccache ccache = NULL;
+   krb5_error_code problem;
+   krb5_context context;
+   int ret = HTTP_INTERNAL_SERVER_ERROR;
+
+   problem = krb5_init_context(&context);
+   if (problem) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Cannot initialize krb5 context");
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+
+   problem = krb5_parse_name(context, princ_name, &princ);
+   if (problem) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
+        "Cannot parse delegated username (%s)", krb5_get_err_text(context, problem));
+      goto end;
+   }
+
+   problem = create_krb5_ccache(context, r, conf, princ, &ccache);
+   if (problem) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        "Cannot create krb5 ccache (%s)", krb5_get_err_text(context, problem));
+      goto end;
+   }
+
+   maj_stat = gss_krb5_copy_ccache(&min_stat, delegated_cred, ccache);
+   if (GSS_ERROR(maj_stat)) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        "Cannot store delegated credential (%s)", 
+        get_gss_error(r->pool, min_stat, "gss_krb5_copy_ccache"));
+      goto end;
+   }
+
+   krb5_cc_close(context, ccache);
+   ccache = NULL;
+   ret = 0;
+
+end:
+   if (princ)
+      krb5_free_principal(context, princ);
+   if (ccache)
+      krb5_cc_destroy(context, ccache);
+   krb5_free_context(context);
+   return ret;
+}
 
-/*************************************************************************** 
- Username/Password Validation
- ***************************************************************************/
-#ifdef KRB5
-int kerb5_password_validate(request_rec *r, const char *user, const char *pass)
+static int
+get_gss_creds(request_rec *r,
+              kerb_auth_config *conf,
+             gss_cred_id_t *server_creds)
 {
-       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_ccache ccache = NULL;
-       krb5_deltat lifetime = 300;     /* 5 minutes */
-       krb5_deltat renewal = 0;
-       krb5_flags options = 0;
-       krb5_data tgtname = {
-               0,
-               KRB5_TGS_NAME_SIZE,
-               KRB5_TGS_NAME
-       };
-       char *c, ccname[MAX_STRING_LEN];
-
-       if (krb5_init_context(&kcontext))
-               return 0;
-
-       if (conf->krb_save_credentials) {
-               lifetime = 1800;        /* 30 minutes */
-
-               if (conf->krb_forwardable) {
-                       options |= KDC_OPT_FORWARDABLE;
-               }
-
-               if (conf->krb_renewable) {
-                       options |= KDC_OPT_RENEWABLE;
-                       renewal = 86400;        /* 24 hours */
-               }
-
-               sprintf(ccname, "FILE:%s/k5cc_ap_%s",
-                       conf->krb_tmp_dir ? conf->krb_tmp_dir : "/tmp",
-                       MK_USER);
-
-               for (c = ccname + strlen(conf->krb_tmp_dir ? conf->krb_tmp_dir :
-                               "/tmp") + 1; *c; c++) {
-                       if (*c == '/')
-                               *c = '.';
-               }
-
-               ap_table_setn(r->subprocess_env, "KRB5CCNAME", ccname);
-               if (krb5_cc_set_default_name(kcontext, ccname)) {
-                       return 0;
-               }
-               unlink(ccname+strlen("FILE:"));
-       }
-
-       if (conf->krb_lifetime) {
-               lifetime = atoi(conf->krb_lifetime);
-       }
-
-       memset((char *)&my_creds, 0, sizeof(my_creds));
-       if(krb5_parse_name(kcontext, user, &me))
-               return 0;
-       my_creds.client = me;
-
-       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;
-       }
-       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 = now + renewal;
-
-       if (conf->krb_save_credentials) {
-               if (krb5_cc_resolve(kcontext, ccname, &ccache))
-                       return 0;
-
-               if (krb5_cc_initialize(kcontext, ccache, me))
-                       return 0;
-       }
-
-       ret = krb5_get_in_tkt_with_password(kcontext, options, 0, NULL, 0,
-                               pass, ccache, &my_creds, 0);
-       if (ret) {
-               return 0;
-       }
-
-       krb5_free_cred_contents(kcontext, &my_creds);
-
-       return 1;
+   gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
+   OM_uint32 major_status, minor_status, minor_status2;
+   gss_name_t server_name = GSS_C_NO_NAME;
+   char buf[1024];
+
+   snprintf(buf, sizeof(buf), "%s/%s", "khttp", ap_get_server_name(r));
+
+   input_token.value = buf;
+   input_token.length = strlen(buf) + 1;
+
+   major_status = gss_import_name(&minor_status, &input_token,
+                                 GSS_C_NT_USER_NAME,
+                                 &server_name);
+   if (GSS_ERROR(major_status)) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "%s", get_gss_error(r->pool, minor_status,
+                "gss_import_name() failed"));
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+   
+   major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
+                                  GSS_C_NO_OID_SET, GSS_C_ACCEPT,
+                                  server_creds, NULL, NULL);
+   gss_release_name(&minor_status2, &server_name);
+   if (GSS_ERROR(major_status)) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                "%s", get_gss_error(r->pool, minor_status,
+                                    "gss_acquire_cred() failed"));
+      return HTTP_INTERNAL_SERVER_ERROR;
+   }
+   
+   return 0;
 }
-#endif /* KRB5 */
 
-#ifdef KRB4
-int kerb4_password_validate(request_rec *r, const char *user, const char *pass)
+static int
+authenticate_user_gss(request_rec *r,
+                     kerb_auth_config *conf,
+                     const char *auth_line)
 {
-       kerb_auth_config *conf =
-               (kerb_auth_config *)ap_get_module_config(r->per_dir_config,
-                                       &kerb_auth_module);
-       int ret;
-       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;
-       }
-
-       instance = strchr(username, '.');
-       if (instance) {
-               *instance++ = '\0';
-       }
-       else {
-               instance = "";
-       }
-
-       realm = strchr(username, '@');
-       if (realm) {
-               *realm++ = '\0';
-       }
-       else {
-               realm = "";
-       }
-
-       if (conf->krb_lifetime) {
-               lifetime = atoi(conf->krb_lifetime);
-       }
-
-       if (conf->krb_force_instance) {
-               instance = conf->krb_force_instance;
-       }
-
-       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);
-
-               if (!strcmp(instance, "")) {
-                       tfname = strcat(tfname, ".");
-                       tfname = strcat(tfname, instance);
-               }
-
-               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, instance, realm, "krbtgt", realm,
-                                       lifetime, (char *)pass);
-       switch (ret) {
-               case INTK_OK:
-               case INTK_W_NOTALL:
-                       return 1;
-                       break;
-
-               default:
-                       return 0;
-                       break;
-       }
+  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;
+  static int initial_return = HTTP_UNAUTHORIZED;
+
+  /* needed to work around replay caches */
+  if (!ap_is_initial_req(r))
+     return initial_return;
+  initial_return = HTTP_UNAUTHORIZED;
+
+  if (gss_connection == NULL) {
+     gss_connection = ap_pcalloc(r->connection->pool, sizeof(*gss_connection));
+     if (gss_connection == NULL) {
+       log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                  "ap_pcalloc() failed (not enough memory)");
+       ret = HTTP_INTERNAL_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 (conf->krb_5_keytab)
+     setenv("KRB5_KTNAME", conf->krb_5_keytab, 1);
+
+  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) {
+     log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+               "No Authorization parameter in request from client");
+     ret = HTTP_UNAUTHORIZED;
+     goto end;
+  }
+
+  input_token.length = ap_base64decode_len(auth_param) + 1;
+  input_token.value = ap_pcalloc(r->connection->pool, input_token.length);
+  if (input_token.value == NULL) {
+     log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+               "ap_pcalloc() failed (not enough memory)");
+     ret = HTTP_INTERNAL_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) + 1;
+     token = ap_pcalloc(r->connection->pool, len + 1);
+     if (token == NULL) {
+       log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                  "ap_pcalloc() failed (not enough memory)");
+        ret = HTTP_INTERNAL_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)) {
+     log_rerror(APLOG_MARK, APLOG_ERR, 0, 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_display_name(&minor_status, client_name, &output_token, NULL);
+  gss_release_name(&minor_status, &client_name); 
+  if (GSS_ERROR(major_status)) {
+    log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+              "%s", get_gss_error(r->pool, minor_status, 
+                                  "gss_export_name() failed"));
+    ret = HTTP_INTERNAL_SERVER_ERROR;
+    goto end;
+  }
+
+  MK_AUTH_TYPE = "Negotiate";
+  MK_USER = ap_pstrdup(r->pool, output_token.value);
+
+  if (conf->krb_save_credentials && delegated_cred != GSS_C_NO_CREDENTIAL)
+     store_gss_creds(r, conf, (char *)output_token.value, delegated_cred);
+
+  gss_release_buffer(&minor_status, &output_token);
+
+  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);
+
+  cleanup_gss_connection(gss_connection);
+
+  initial_return = ret;
+  return ret;
 }
-#endif /* KRB4 */
+#endif /* KRB5 */
 
 
+static void
+note_kerb_auth_failure(request_rec *r, const kerb_auth_config *conf,
+                      int use_krb4, int use_krb5)
+{
+   const char *auth_name = NULL;
+   int set_basic = 0;
 
+   /* get the user realm specified in .htaccess */
+   auth_name = ap_auth_name(r);
 
-/*************************************************************************** 
- User Authentication
- ***************************************************************************/
-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);
-
-       type = ap_auth_type(r);
-
-       if (type != NULL) {
+   /* XXX should the WWW-Authenticate header be cleared first? */
 #ifdef KRB5
-               if ((strncasecmp(type, "KerberosV5", 10) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosV5", 10) == 0)) {
-                       KerberosV5 = 1;
-               }
-#endif /* KRB5 */
+   if (use_krb5 && conf->krb_method_gssapi)
+      ap_table_add(r->err_headers_out, "WWW-Authenticate", "GSS-Negotiate ");
+   if (use_krb5 && conf->krb_method_k5pass) {
+      ap_table_add(r->err_headers_out, "WWW-Authenticate",
+                   ap_pstrcat(r->pool, "Basic realm=\"", auth_name, "\"", NULL));
+      set_basic = 1;
+   }
+#endif
 
 #ifdef KRB4
-               if ((strncasecmp(type, "KerberosV4", 10) == 0) ||
-                   (strncasecmp(conf->krb_auth_type, "KerberosV4", 10) == 0)) {
-                       KerberosV4 = 1;
-               }
-#endif /* KRB4 */
+   if (use_krb4 && conf->krb_method_k4pass && !set_basic)
+      ap_table_add(r->err_headers_out, "WWW-Authenticate",
+                  ap_pstrcat(r->pool, "Basic realm=\"", auth_name, "\"", NULL));
+#endif
+}
 
-#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 */
-       }
-
-       if (!KerberosV4 && !KerberosV5) {
-               if (conf->krb_authoritative) {
-                       return HTTP_UNAUTHORIZED;
-               }
-               else {
-                       return DECLINED;
-               }
-       }
-
-       name = ap_auth_name(r);
-       if (!name) {
-               return HTTP_INTERNAL_SERVER_ERROR;
-       }
-
-       if (!auth_line) {
-               MK_TABLE_SET(r->err_headers_out, "WWW-Authenticate",
-                       (char *)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;
+int kerb_authenticate_user(request_rec *r)
+{
+   kerb_auth_config *conf = 
+      (kerb_auth_config *) ap_get_module_config(r->per_dir_config,
+                                               &auth_kerb_module);
+   const char *auth_type = NULL;
+   const char *auth_line = NULL;
+   const char *type = NULL;
+   int use_krb5 = 0, use_krb4 = 0;
+   int ret;
+
+   /* get the type specified in .htaccess */
+   type = ap_auth_type(r);
+
+   if (type && strcasecmp(type, "Kerberos") == 0)
+      use_krb5 = use_krb4 = 1;
+   else if(type && strcasecmp(type, "KerberosV5") == 0)
+      use_krb4 = 0;
+   else if(type && strcasecmp(type, "KerberosV4") == 0)
+      use_krb5 = 0;
+   else
+      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_kerb_auth_failure(r, conf, use_krb4, use_krb5);
+      return HTTP_UNAUTHORIZED;
+   }
+   auth_type = ap_getword_white(r->pool, &auth_line);
+
+   ret = HTTP_UNAUTHORIZED;
 
 #ifdef KRB5
-       if (KerberosV5 && !KerberosV4first && retcode != OK) {
-               MK_AUTH_TYPE = "KerberosV5";
-               if (kerb5_password_validate(r, MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB5 */
+   if (use_krb5 && conf->krb_method_gssapi &&
+       strcasecmp(auth_type, "GSS-Negotiate") == 0) {
+      ret = authenticate_user_gss(r, conf, auth_line);
+   } else if (use_krb5 && 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(r, MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB4 */
-
-#if defined(KRB5) && defined(KRB4)
-       if (KerberosV5 && KerberosV4first && retcode != OK) {
-               MK_AUTH_TYPE = "KerberosV5";
-               if (kerb5_password_validate(r, MK_USER, sent_pw)) {
-                       retcode = OK;
-               }
-               else {
-                       retcode = conf->krb_fail_status;
-               }
-       }
-#endif /* KRB5 && KRB4 */
-
-       if (conf->krb_authoritative && retcode == DECLINED) {
-               return HTTP_UNAUTHORIZED;
-       }
-       else {
-               return retcode;
-       }
-}
+   if (ret == HTTP_UNAUTHORIZED && use_krb4 && conf->krb_method_k4pass &&
+       strcasecmp(auth_type, "Basic") == 0)
+      ret = authenticate_user_krb4pwd(r, conf, auth_line);
+#endif
 
+   if (ret == HTTP_UNAUTHORIZED)
+      note_kerb_auth_failure(r, conf, use_krb4, use_krb5);
 
-
-
-/*************************************************************************** 
- Access Verification
- ***************************************************************************/
-int kerb_check_user_access(request_rec *r)
-{
-       register int x;
-       const char *t, *w;
-       const MK_ARRAY_HEADER *reqs_arr = ap_requires(r);
-       require_line *reqs;
-       kerb_auth_config *conf =
-               (kerb_auth_config *)ap_get_module_config(r->per_dir_config,
-                                               &kerb_auth_module);
-
-       if (reqs_arr == NULL) {
-               return OK;
-       }
-       reqs = (require_line *)reqs_arr->elts;
-
-       for (x = 0; x < reqs_arr->nelts; x++) {
-               t = reqs[x].requirement;
-               w = ap_getword_white(r->pool, &t);
-               if (strcmp(w, "realm") == 0) {
-                       while (t[0] != '\0') {
-                               w = ap_getword_conf(r->pool, &t);
-                               if (strcmp(MK_USER, w) == 0) {
-                                       return OK;
-                               }
-                       }
-               }
-       }
-
-       return DECLINED;
+   return ret;
 }
 
 
-
-
 /*************************************************************************** 
  Module Setup/Configuration
  ***************************************************************************/
 #ifdef APXS1
-module MODULE_VAR_EXPORT kerb_auth_module = {
+module MODULE_VAR_EXPORT auth_kerb_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   */
@@ -794,7 +1069,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                        */
@@ -803,31 +1078,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 =
+module AP_MODULE_DECLARE_DATA auth_kerb_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