s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e89...
[amitay/samba.git] / source4 / heimdal / lib / gssapi / krb5 / init_sec_context.c
index d4482a54b275243ca8414d4c069c001c42544b4a..4b632bd95ac768852df380b9951eca4ace827468 100644 (file)
@@ -1,39 +1,39 @@
 /*
- * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
+ * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * 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. 
+ * 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. 
+ * 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. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS 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 INSTITUTE OR 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 IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS 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 INSTITUTE OR 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.
  */
 
-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"
 
-RCSID("$Id: init_sec_context.c 22671 2008-03-09 23:57:54Z lha $");
+RCSID("$Id$");
 
 /*
  * copy the addresses from `input_chan_bindings' (if any) to
@@ -43,14 +43,14 @@ RCSID("$Id: init_sec_context.c 22671 2008-03-09 23:57:54Z lha $");
 static OM_uint32
 set_addresses (krb5_context context,
               krb5_auth_context ac,
-              const gss_channel_bindings_t input_chan_bindings)               
+              const gss_channel_bindings_t input_chan_bindings)        
 {
-    /* Port numbers are expected to be in application_data.value, 
-     * initator's port first */ 
+    /* Port numbers are expected to be in application_data.value,
+     * initator's port first */
 
     krb5_address initiator_addr, acceptor_addr;
     krb5_error_code kret;
-       
+
     if (input_chan_bindings == GSS_C_NO_CHANNEL_BINDINGS
        || input_chan_bindings->application_data.length !=
        2 * sizeof(ac->local_port))
@@ -58,13 +58,13 @@ set_addresses (krb5_context context,
 
     memset(&initiator_addr, 0, sizeof(initiator_addr));
     memset(&acceptor_addr, 0, sizeof(acceptor_addr));
-       
+
     ac->local_port =
        *(int16_t *) input_chan_bindings->application_data.value;
-       
+
     ac->remote_port =
        *((int16_t *) input_chan_bindings->application_data.value + 1);
-       
+
     kret = _gsskrb5i_address_to_krb5addr(context,
                                         input_chan_bindings->acceptor_addrtype,
                                         &input_chan_bindings->acceptor_address,
@@ -72,7 +72,7 @@ set_addresses (krb5_context context,
                                         &acceptor_addr);
     if (kret)
        return kret;
-           
+
     kret = _gsskrb5i_address_to_krb5addr(context,
                                         input_chan_bindings->initiator_addrtype,
                                         &input_chan_bindings->initiator_address,
@@ -82,15 +82,15 @@ set_addresses (krb5_context context,
        krb5_free_address (context, &acceptor_addr);
        return kret;
     }
-       
+
     kret = krb5_auth_con_setaddrs(context,
                                  ac,
                                  &initiator_addr,  /* local address */
                                  &acceptor_addr);  /* remote address */
-       
+
     krb5_free_address (context, &initiator_addr);
     krb5_free_address (context, &acceptor_addr);
-       
+
 #if 0
     free(input_chan_bindings->application_data.value);
     input_chan_bindings->application_data.value = NULL;
@@ -121,6 +121,8 @@ _gsskrb5_create_ctx(
     ctx->auth_context          = NULL;
     ctx->source                        = NULL;
     ctx->target                        = NULL;
+    ctx->kcred                 = NULL;
+    ctx->ccache                        = NULL;
     ctx->state                 = state;
     ctx->flags                 = 0;
     ctx->more_flags            = 0;
@@ -129,14 +131,13 @@ _gsskrb5_create_ctx(
     krb5_data_zero(&ctx->fwd_data);
     ctx->lifetime              = GSS_C_INDEFINITE;
     ctx->order                 = NULL;
+    ctx->crypto                        = NULL;
     HEIMDAL_MUTEX_init(&ctx->ctx_id_mutex);
 
     kret = krb5_auth_con_init (context, &ctx->auth_context);
     if (kret) {
        *minor_status = kret;
-
        HEIMDAL_MUTEX_destroy(&ctx->ctx_id_mutex);
-               
        return GSS_S_FAILURE;
     }
 
@@ -173,7 +174,8 @@ gsskrb5_get_creds(
        krb5_context context,
        krb5_ccache ccache,
        gsskrb5_ctx ctx,
-       krb5_const_principal target_name,
+       const gss_name_t target_name,
+       int use_dns,
        OM_uint32 time_req,
        OM_uint32 * time_rec,
        krb5_creds ** cred)
@@ -185,6 +187,16 @@ gsskrb5_get_creds(
 
     *cred = NULL;
 
+    if (ctx->target) {
+       krb5_free_principal(context, ctx->target);
+       ctx->target = NULL;
+    }
+
+    ret = _gsskrb5_canon_name(minor_status, context, use_dns,
+                             target_name, &ctx->target);
+    if (ret)
+       return ret;
+
     memset(&this_cred, 0, sizeof(this_cred));
     this_cred.client = ctx->source;
     this_cred.server = ctx->target;
@@ -232,27 +244,33 @@ gsskrb5_initiator_ready(
        gsskrb5_ctx ctx,
        krb5_context context)
 {
-       OM_uint32 ret;
-       int32_t seq_number;
-       int is_cfx = 0;
-       OM_uint32 flags = ctx->flags;
+    OM_uint32 ret;
+    int32_t seq_number;
+    int is_cfx = 0;
+    OM_uint32 flags = ctx->flags;
 
-       krb5_auth_getremoteseqnumber (context,
-                                     ctx->auth_context,
-                                     &seq_number);
+    krb5_free_creds(context, ctx->kcred);
+    ctx->kcred = NULL;
 
-       _gsskrb5i_is_cfx(ctx, &is_cfx);
+    if (ctx->more_flags & CLOSE_CCACHE)
+       krb5_cc_close(context, ctx->ccache);
+    ctx->ccache = NULL;
 
-       ret = _gssapi_msg_order_create(minor_status,
-                                      &ctx->order,
-                                      _gssapi_msg_order_f(flags),
-                                      seq_number, 0, is_cfx);
-       if (ret) return ret;
+    krb5_auth_getremoteseqnumber (context, ctx->auth_context, &seq_number);
 
-       ctx->state      = INITIATOR_READY;
-       ctx->more_flags |= OPEN;
+    _gsskrb5i_is_cfx(context, ctx, 0);
+    is_cfx = (ctx->more_flags & IS_CFX);
 
-       return GSS_S_COMPLETE;
+    ret = _gssapi_msg_order_create(minor_status,
+                                  &ctx->order,
+                                  _gssapi_msg_order_f(flags),
+                                  seq_number, 0, is_cfx);
+    if (ret) return ret;
+
+    ctx->state = INITIATOR_READY;
+    ctx->more_flags    |= OPEN;
+
+    return GSS_S_COMPLETE;
 }
 
 /*
@@ -266,19 +284,20 @@ do_delegation (krb5_context context,
               krb5_creds *cred,
               krb5_const_principal name,
               krb5_data *fwd_data,
+              uint32_t flagmask,
               uint32_t *flags)
 {
     krb5_creds creds;
     KDCOptions fwd_flags;
     krb5_error_code kret;
-       
+
     memset (&creds, 0, sizeof(creds));
     krb5_data_zero (fwd_data);
-       
+
     kret = krb5_cc_get_principal(context, ccache, &creds.client);
-    if (kret) 
+    if (kret)
        goto out;
-       
+
     kret = krb5_build_principal(context,
                                &creds.server,
                                strlen(creds.client->realm),
@@ -287,18 +306,18 @@ do_delegation (krb5_context context,
                                creds.client->realm,
                                NULL);
     if (kret)
-       goto out; 
-       
+       goto out;
+
     creds.times.endtime = 0;
-       
+
     memset(&fwd_flags, 0, sizeof(fwd_flags));
     fwd_flags.forwarded = 1;
     fwd_flags.forwardable = 1;
-       
+
     if ( /*target_name->name.name_type != KRB5_NT_SRV_HST ||*/
-       name->name.name_string.len < 2) 
+       name->name.name_string.len < 2)
        goto out;
-       
+
     kret = krb5_get_forwarded_creds(context,
                                    ac,
                                    ccache,
@@ -306,13 +325,13 @@ do_delegation (krb5_context context,
                                    name->name.name_string.val[1],
                                    &creds,
                                    fwd_data);
-       
+
  out:
     if (kret)
-       *flags &= ~GSS_C_DELEG_FLAG;
+       *flags &= ~flagmask;
     else
-       *flags |= GSS_C_DELEG_FLAG;
-       
+       *flags |= flagmask;
+
     if (creds.client)
        krb5_free_principal(context, creds.client);
     if (creds.server)
@@ -329,11 +348,10 @@ init_auth
  gsskrb5_cred cred,
  gsskrb5_ctx ctx,
  krb5_context context,
krb5_const_principal name,
gss_name_t name,
  const gss_OID mech_type,
  OM_uint32 req_flags,
  OM_uint32 time_req,
- const gss_channel_bindings_t input_chan_bindings,
  const gss_buffer_t input_token,
  gss_OID * actual_mech_type,
  gss_buffer_t output_token,
@@ -343,16 +361,10 @@ init_auth
 {
     OM_uint32 ret = GSS_S_FAILURE;
     krb5_error_code kret;
-    krb5_flags ap_options;
-    krb5_creds *kcred = NULL;
     krb5_data outbuf;
-    krb5_ccache ccache = NULL;
-    uint32_t flags;
-    krb5_data authenticator;
-    Checksum cksum;
-    krb5_enctype enctype;
     krb5_data fwd_data;
     OM_uint32 lifetime_rec;
+    int allow_dns = 1;
 
     krb5_data_zero(&outbuf);
     krb5_data_zero(&fwd_data);
@@ -363,23 +375,17 @@ init_auth
        *actual_mech_type = GSS_KRB5_MECHANISM;
 
     if (cred == NULL) {
-       kret = krb5_cc_default (context, &ccache);
+       kret = krb5_cc_default (context, &ctx->ccache);
        if (kret) {
            *minor_status = kret;
            ret = GSS_S_FAILURE;
            goto failure;
        }
+       ctx->more_flags |= CLOSE_CCACHE;
     } else
-       ccache = cred->ccache;
+       ctx->ccache = cred->ccache;
 
-    kret = krb5_cc_get_principal (context, ccache, &ctx->source);
-    if (kret) {
-       *minor_status = kret;
-       ret = GSS_S_FAILURE;
-       goto failure;
-    }
-
-    kret = krb5_copy_principal (context, name, &ctx->target);
+    kret = krb5_cc_get_principal (context, ctx->ccache, &ctx->source);
     if (kret) {
        *minor_status = kret;
        ret = GSS_S_FAILURE;
@@ -405,26 +411,40 @@ init_auth
        krb5_set_default_in_tkt_etypes(context, enctypes);
     }
 
-    ret = gsskrb5_get_creds(minor_status,
-                           context,
-                           ccache,
-                           ctx,
-                           ctx->target,
-                           time_req,
-                           time_rec,
-                           &kcred);
+    /* canon name if needed for client + target realm */
+    kret = krb5_cc_get_config(context, ctx->ccache, NULL,
+                             "realm-config", &outbuf);
+    if (kret == 0) {
+       /* XXX 2 is no server canon */
+       if (outbuf.length < 1 || ((((unsigned char *)outbuf.data)[0]) & 2))
+           allow_dns = 0;
+       krb5_data_free(&outbuf);
+    }
+
+    /*
+     * First we try w/o dns, hope that the KDC have register alias
+     * (and referrals if cross realm) for this principal. If that
+     * fails and if we are allowed to using this realm try again with
+     * DNS canonicalizion.
+     */
+    ret = gsskrb5_get_creds(minor_status, context, ctx->ccache,
+                           ctx, name, 0, time_req, 
+                           time_rec, &ctx->kcred);
+    if (ret && allow_dns)
+       ret = gsskrb5_get_creds(minor_status, context, ctx->ccache,
+                               ctx, name, 1, time_req, 
+                               time_rec, &ctx->kcred);
     if (ret)
        goto failure;
 
-    ctx->lifetime = kcred->times.endtime;
+    ctx->lifetime = ctx->kcred->times.endtime;
 
     ret = _gsskrb5_lifetime_left(minor_status,
                                 context,
                                 ctx->lifetime,
                                 &lifetime_rec);
-    if (ret) {
+    if (ret)
        goto failure;
-    }
 
     if (lifetime_rec == 0) {
        *minor_status = 0;
@@ -432,54 +452,112 @@ init_auth
        goto failure;
     }
 
-    krb5_auth_con_setkey(context, 
-                        ctx->auth_context, 
-                        &kcred->session);
+    krb5_auth_con_setkey(context,
+                        ctx->auth_context,
+                        &ctx->kcred->session);
 
-    kret = krb5_auth_con_generatelocalsubkey(context, 
+    kret = krb5_auth_con_generatelocalsubkey(context,
                                             ctx->auth_context,
-                                            &kcred->session);
+                                            &ctx->kcred->session);
     if(kret) {
        *minor_status = kret;
        ret = GSS_S_FAILURE;
        goto failure;
     }
-    
-    /* 
-     * If the credential doesn't have ok-as-delegate, check what local
-     * policy say about ok-as-delegate, default is FALSE that makes
-     * code ignore the KDC setting and follow what the application
-     * requested. If it is TRUE, strip of the GSS_C_DELEG_FLAG if the
-     * KDC doesn't set ok-as-delegate.
+
+    return GSS_S_COMPLETE;
+
+failure:
+    if (ctx->ccache && (ctx->more_flags & CLOSE_CCACHE))
+       krb5_cc_close(context, ctx->ccache);
+    ctx->ccache = NULL;
+
+    return ret;
+
+}
+
+static OM_uint32
+init_auth_restart
+(OM_uint32 * minor_status,
+ gsskrb5_cred cred,
+ gsskrb5_ctx ctx,
+ krb5_context context,
+ OM_uint32 req_flags,
+ const gss_channel_bindings_t input_chan_bindings,
+ const gss_buffer_t input_token,
+ gss_OID * actual_mech_type,
+ gss_buffer_t output_token,
+ OM_uint32 * ret_flags,
+ OM_uint32 * time_rec
+    )
+{
+    OM_uint32 ret = GSS_S_FAILURE;
+    krb5_error_code kret;
+    krb5_flags ap_options;
+    krb5_data outbuf;
+    uint32_t flags;
+    krb5_data authenticator;
+    Checksum cksum;
+    krb5_enctype enctype;
+    krb5_data fwd_data, timedata;
+    int32_t offset = 0, oldoffset;
+    uint32_t flagmask;
+
+    krb5_data_zero(&outbuf);
+    krb5_data_zero(&fwd_data);
+
+    *minor_status = 0;
+
+    /*
+     * If the credential doesn't have ok-as-delegate, check if there
+     * is a realm setting and use that.
      */
-    if (!kcred->flags.b.ok_as_delegate) {
-       krb5_boolean delegate;
-    
-       krb5_appdefault_boolean(context,
-                               "gssapi", name->realm,
-                               "ok-as-delegate", FALSE, &delegate);
-       if (delegate)
-           req_flags &= ~GSS_C_DELEG_FLAG;
+    if (!ctx->kcred->flags.b.ok_as_delegate) {
+       krb5_data data;
+       
+       ret = krb5_cc_get_config(context, ctx->ccache, NULL,
+                                "realm-config", &data);
+       if (ret == 0) {
+           /* XXX 1 is use ok-as-delegate */
+           if (data.length < 1 || ((((unsigned char *)data.data)[0]) & 1) == 0)
+               req_flags &= ~(GSS_C_DELEG_FLAG|GSS_C_DELEG_POLICY_FLAG);
+           krb5_data_free(&data);
+       }
     }
 
+    flagmask = 0;
+
+    /* if we used GSS_C_DELEG_POLICY_FLAG, trust KDC */
+    if ((req_flags & GSS_C_DELEG_POLICY_FLAG)
+       && ctx->kcred->flags.b.ok_as_delegate)
+       flagmask |= GSS_C_DELEG_FLAG | GSS_C_DELEG_POLICY_FLAG;
+    /* if there still is a GSS_C_DELEG_FLAG, use that */
+    if (req_flags & GSS_C_DELEG_FLAG)
+       flagmask |= GSS_C_DELEG_FLAG;
+
+
     flags = 0;
     ap_options = 0;
-    if (req_flags & GSS_C_DELEG_FLAG)
+    if (flagmask & GSS_C_DELEG_FLAG) {
        do_delegation (context,
                       ctx->auth_context,
-                      ccache, kcred, name, &fwd_data, &flags);
-    
+                      ctx->ccache, ctx->kcred, ctx->target,
+                      &fwd_data, flagmask, &flags);
+    }
+
     if (req_flags & GSS_C_MUTUAL_FLAG) {
        flags |= GSS_C_MUTUAL_FLAG;
        ap_options |= AP_OPTS_MUTUAL_REQUIRED;
     }
-    
+
     if (req_flags & GSS_C_REPLAY_FLAG)
        flags |= GSS_C_REPLAY_FLAG;
     if (req_flags & GSS_C_SEQUENCE_FLAG)
        flags |= GSS_C_SEQUENCE_FLAG;
+#if 0
     if (req_flags & GSS_C_ANON_FLAG)
        ;                               /* XXX */
+#endif
     if (req_flags & GSS_C_DCE_STYLE) {
        /* GSS_C_DCE_STYLE implies GSS_C_MUTUAL_FLAG */
        flags |= GSS_C_DCE_STYLE | GSS_C_MUTUAL_FLAG;
@@ -490,17 +568,23 @@ init_auth
     if (req_flags & GSS_C_EXTENDED_ERROR_FLAG)
        flags |= GSS_C_EXTENDED_ERROR_FLAG;
 
+    if (req_flags & GSS_C_CONF_FLAG) {
+       flags |= GSS_C_CONF_FLAG;
+    }
+    if (req_flags & GSS_C_INTEG_FLAG) {
+       flags |= GSS_C_INTEG_FLAG;
+    }
     if (cred == NULL || !(cred->cred_flags & GSS_CF_NO_CI_FLAGS)) {
        flags |= GSS_C_CONF_FLAG;
        flags |= GSS_C_INTEG_FLAG;
     }
     flags |= GSS_C_TRANS_FLAG;
-    
+
     if (ret_flags)
        *ret_flags = flags;
     ctx->flags = flags;
     ctx->more_flags |= LOCAL;
-    
+
     ret = _gsskrb5_create_8003_checksum (minor_status,
                                         input_chan_bindings,
                                         flags,
@@ -512,16 +596,33 @@ init_auth
 
     enctype = ctx->auth_context->keyblock->keytype;
 
+    ret = krb5_cc_get_config(context, ctx->ccache, ctx->target,
+                            "time-offset", &timedata);
+    if (ret == 0) {
+       if (timedata.length == 4) {
+           const u_char *p = timedata.data;
+           offset = (p[0] <<24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0);
+       }
+       krb5_data_free(&timedata);
+    }
+
+    if (offset) {
+       krb5_get_kdc_sec_offset (context, &oldoffset, NULL);
+       krb5_set_kdc_sec_offset (context, offset, -1);
+    }
+
     kret = krb5_build_authenticator (context,
                                     ctx->auth_context,
                                     enctype,
-                                    kcred,
+                                    ctx->kcred,
                                     &cksum,
                                     NULL,
                                     &authenticator,
                                     KRB5_KU_AP_REQ_AUTH);
 
     if (kret) {
+       if (offset)
+           krb5_set_kdc_sec_offset (context, oldoffset, -1);
        *minor_status = kret;
        ret = GSS_S_FAILURE;
        goto failure;
@@ -529,27 +630,30 @@ init_auth
 
     kret = krb5_build_ap_req (context,
                              enctype,
-                             kcred,
+                             ctx->kcred,
                              ap_options,
                              authenticator,
                              &outbuf);
-
+    if (offset)
+       krb5_set_kdc_sec_offset (context, oldoffset, -1);
     if (kret) {
        *minor_status = kret;
        ret = GSS_S_FAILURE;
        goto failure;
     }
 
-    ret = _gsskrb5_encapsulate (minor_status, &outbuf, output_token,
-                                  (u_char *)"\x01\x00", GSS_KRB5_MECHANISM);
-    if (ret)
-       goto failure;
+    if (flags & GSS_C_DCE_STYLE) {
+       output_token->value = outbuf.data;
+       output_token->length = outbuf.length;
+    } else {
+        ret = _gsskrb5_encapsulate (minor_status, &outbuf, output_token,
+                                   (u_char *)"\x01\x00", GSS_KRB5_MECHANISM);
+       krb5_data_free (&outbuf);
+       if (ret)
+           goto failure;
+    }
 
-    krb5_data_free (&outbuf);
-    krb5_free_creds(context, kcred);
     free_Checksum(&cksum);
-    if (cred == NULL)
-       krb5_cc_close(context, ccache);
 
     if (flags & GSS_C_MUTUAL_FLAG) {
        ctx->state = INITIATOR_WAIT_FOR_MUTAL;
@@ -558,15 +662,14 @@ init_auth
 
     return gsskrb5_initiator_ready(minor_status, ctx, context);
 failure:
-    if(kcred)
-       krb5_free_creds(context, kcred);
-    if (ccache && cred == NULL)
-       krb5_cc_close(context, ccache);
+    if (ctx->ccache && (ctx->more_flags & CLOSE_CCACHE))
+       krb5_cc_close(context, ctx->ccache);
+    ctx->ccache = NULL;
 
     return ret;
-
 }
 
+
 static OM_uint32
 repl_mutual
 (OM_uint32 * minor_status,
@@ -587,7 +690,6 @@ repl_mutual
     krb5_error_code kret;
     krb5_data indata;
     krb5_ap_rep_enc_part *repl;
-    int is_cfx = 0;
 
     output_token->length = 0;
     output_token->value = NULL;
@@ -605,8 +707,46 @@ repl_mutual
                                    &indata,
                                    "\x02\x00",
                                    GSS_KRB5_MECHANISM);
-       if (ret) {
-           /* XXX - Handle AP_ERROR */
+       if (ret == GSS_S_DEFECTIVE_TOKEN) {
+           /* check if there is an error token sent instead */
+           ret = _gsskrb5_decapsulate (minor_status,
+                                       input_token,
+                                       &indata,
+                                       "\x03\x00",
+                                       GSS_KRB5_MECHANISM);
+           if (ret == GSS_S_COMPLETE) {
+               KRB_ERROR error;
+               
+               kret = krb5_rd_error(context, &indata, &error);
+               if (kret == 0) {
+                   kret = krb5_error_from_rd_error(context, &error, NULL);
+
+                   /* save the time skrew for this host */
+                   if (kret == KRB5KRB_AP_ERR_SKEW) {
+                       krb5_data timedata;
+                       unsigned char p[4];
+                       int32_t t = error.stime - time(NULL);
+
+                       p[0] = (t >> 24) & 0xFF;
+                       p[1] = (t >> 16) & 0xFF;
+                       p[2] = (t >> 8)  & 0xFF;
+                       p[3] = (t >> 0)  & 0xFF;
+
+                       timedata.data = p;
+                       timedata.length = sizeof(p);
+
+                       krb5_cc_set_config(context, ctx->ccache, ctx->target,
+                                          "time-offset", &timedata);
+
+                       if ((ctx->more_flags & RETRIED) == 0)
+                           ctx->state = INITIATOR_RESTART;
+                       ctx->more_flags |= RETRIED;
+                   }
+                   free_KRB_ERROR (&error);
+               }
+               *minor_status = kret;
+               return GSS_S_FAILURE;
+           }
            return ret;
        }
     }
@@ -621,20 +761,6 @@ repl_mutual
     }
     krb5_free_ap_rep_enc_part (context,
                               repl);
-    
-    _gsskrb5i_is_cfx(ctx, &is_cfx);
-    if (is_cfx) {
-       krb5_keyblock *key = NULL;
-
-       kret = krb5_auth_con_getremotesubkey(context,
-                                            ctx->auth_context, 
-                                            &key);
-       if (kret == 0 && key != NULL) {
-           ctx->more_flags |= ACCEPTOR_SUBKEY;
-           krb5_free_keyblock (context, key);
-       }
-    }
-
 
     *minor_status = 0;
     if (time_rec) {
@@ -649,30 +775,31 @@ repl_mutual
        *ret_flags = ctx->flags;
 
     if (req_flags & GSS_C_DCE_STYLE) {
-       int32_t con_flags;
+       int32_t local_seq, remote_seq;
        krb5_data outbuf;
 
-       /* Do don't do sequence number for the mk-rep */
-       krb5_auth_con_removeflags(context,
-                                 ctx->auth_context,
-                                 KRB5_AUTH_CONTEXT_DO_SEQUENCE,
-                                 &con_flags);
+       /*
+        * So DCE_STYLE is strange. The client echos the seq number
+        * that the server used in the server's mk_rep in its own
+        * mk_rep(). After when done, it resets to it's own seq number
+        * for the gss_wrap calls.
+        */
 
-       kret = krb5_mk_rep(context,
-                          ctx->auth_context,
-                          &outbuf);
+       krb5_auth_getremoteseqnumber(context, ctx->auth_context, &remote_seq);
+       krb5_auth_con_getlocalseqnumber(context, ctx->auth_context, &local_seq);
+       krb5_auth_con_setlocalseqnumber(context, ctx->auth_context, remote_seq);
+
+       kret = krb5_mk_rep(context, ctx->auth_context, &outbuf);
        if (kret) {
            *minor_status = kret;
            return GSS_S_FAILURE;
        }
        
+       /* reset local seq number */
+       krb5_auth_con_setlocalseqnumber(context, ctx->auth_context, local_seq); 
+
        output_token->length = outbuf.length;
        output_token->value  = outbuf.data;
-
-       krb5_auth_con_removeflags(context,
-                                 ctx->auth_context,
-                                 KRB5_AUTH_CONTEXT_DO_SEQUENCE,
-                                 NULL);
     }
 
     return gsskrb5_initiator_ready(minor_status, ctx, context);
@@ -700,7 +827,6 @@ OM_uint32 _gsskrb5_init_sec_context
 {
     krb5_context context;
     gsskrb5_cred cred = (gsskrb5_cred)cred_handle;
-    krb5_const_principal name = (krb5_const_principal)target_name;
     gsskrb5_ctx ctx;
     OM_uint32 ret;
 
@@ -726,7 +852,7 @@ OM_uint32 _gsskrb5_init_sec_context
        return GSS_S_BAD_NAME;
     }
 
-    if (mech_type != GSS_C_NO_OID && 
+    if (mech_type != GSS_C_NO_OID &&
        !gss_oid_equal(mech_type, GSS_KRB5_MECHANISM))
        return GSS_S_BAD_MECH;
 
@@ -737,7 +863,7 @@ OM_uint32 _gsskrb5_init_sec_context
            *minor_status = 0;
            return GSS_S_FAILURE | GSS_S_CALL_BAD_STRUCTURE;
        }
-    
+
        ret = _gsskrb5_create_ctx(minor_status,
                                  context_handle,
                                  context,
@@ -756,22 +882,37 @@ OM_uint32 _gsskrb5_init_sec_context
 
     HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
 
+ again:
     switch (ctx->state) {
     case INITIATOR_START:
        ret = init_auth(minor_status,
                        cred,
                        ctx,
                        context,
-                       name,
+                       target_name,
                        mech_type,
                        req_flags,
                        time_req,
-                       input_chan_bindings,
                        input_token,
                        actual_mech_type,
                        output_token,
                        ret_flags,
                        time_rec);
+       if (ret != GSS_S_COMPLETE)
+           break;      
+       /* FALL THOUGH */
+    case INITIATOR_RESTART:
+       ret = init_auth_restart(minor_status,
+                               cred,
+                               ctx,
+                               context,
+                               req_flags,
+                               input_chan_bindings,
+                               input_token,
+                               actual_mech_type,
+                               output_token,
+                               ret_flags,
+                               time_rec);
        break;
     case INITIATOR_WAIT_FOR_MUTAL:
        ret = repl_mutual(minor_status,
@@ -786,17 +927,24 @@ OM_uint32 _gsskrb5_init_sec_context
                          output_token,
                          ret_flags,
                          time_rec);
+       if (ctx->state == INITIATOR_RESTART)
+           goto again;
        break;
     case INITIATOR_READY:
-       /* 
+       /*
         * If we get there, the caller have called
         * gss_init_sec_context() one time too many.
         */
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "init_sec_context "
+                           "called one time too many");
+       *minor_status = EINVAL;
        ret = GSS_S_BAD_STATUS;
        break;
     default:
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "init_sec_context "
+                           "invalid state %d for client",
+                           (int)ctx->state);
+       *minor_status = EINVAL;
        ret = GSS_S_BAD_STATUS;
        break;
     }