r23651: Always, always, always compile before commit...
[ira/wip.git] / source3 / libsmb / clikrb5.c
index 5c5584763c419af361e9caae5601097a7eaa3cc7..96c18c3a8c86ad1cbfc439e8dc3d2cc2a432cc37 100644 (file)
@@ -3,6 +3,8 @@
    simple kerberos5 routines for active directory
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Luke Howard 2002-2003
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Guenther Deschner 2005-2007
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#define KRB5_PRIVATE    1       /* this file uses PRIVATE interfaces! */
+#define KRB5_DEPRECATED 1       /* this file uses DEPRECATED interfaces! */
+
 #include "includes.h"
 
 #ifdef HAVE_KRB5
 
-#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE
-#define KRB5_KEY_TYPE(k)       ((k)->keytype)
+#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */
+#define KRB5_KEY_TYPE(k)       ((k)->keytype) 
 #define KRB5_KEY_LENGTH(k)     ((k)->keyvalue.length)
 #define KRB5_KEY_DATA(k)       ((k)->keyvalue.data)
-#else
+#else /* MIT */
 #define        KRB5_KEY_TYPE(k)        ((k)->enctype)
 #define KRB5_KEY_LENGTH(k)     ((k)->length)
 #define KRB5_KEY_DATA(k)       ((k)->contents)
 #endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
 
+/**************************************************************
+ Wrappers around kerberos string functions that convert from
+ utf8 -> unix charset and vica versa.
+**************************************************************/
+
+/**************************************************************
+ krb5_parse_name that takes a UNIX charset.
+**************************************************************/
+
+ krb5_error_code smb_krb5_parse_name(krb5_context context,
+                               const char *name, /* in unix charset */
+                               krb5_principal *principal)
+{
+       krb5_error_code ret;
+       char *utf8_name;
+
+       if (push_utf8_allocate(&utf8_name, name) == (size_t)-1) {
+               return ENOMEM;
+       }
+
+       ret = krb5_parse_name(context, utf8_name, principal);
+       SAFE_FREE(utf8_name);
+       return ret;
+}
+
+#ifdef HAVE_KRB5_PARSE_NAME_NOREALM
+/**************************************************************
+ krb5_parse_name_norealm that takes a UNIX charset.
+**************************************************************/
+
+static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,
+                               const char *name, /* in unix charset */
+                               krb5_principal *principal)
+{
+       krb5_error_code ret;
+       char *utf8_name;
+
+       *principal = NULL;
+       if (push_utf8_allocate(&utf8_name, name) == (size_t)-1) {
+               return ENOMEM;
+       }
+
+       ret = krb5_parse_name_norealm(context, utf8_name, principal);
+       SAFE_FREE(utf8_name);
+       return ret;
+}
+#endif
+
+/**************************************************************
+ krb5_parse_name that returns a UNIX charset name. Must
+ be freed with normal free() call.
+**************************************************************/
+
+ krb5_error_code smb_krb5_unparse_name(krb5_context context,
+                                       krb5_const_principal principal,
+                                       char **unix_name)
+{
+       krb5_error_code ret;
+       char *utf8_name;
+
+       *unix_name = NULL;
+       ret = krb5_unparse_name(context, principal, &utf8_name);
+       if (ret) {
+               return ret;
+       }
+
+       if (pull_utf8_allocate(unix_name, utf8_name)==-1) {
+               krb5_free_unparsed_name(context, utf8_name);
+               return ENOMEM;
+       }
+       krb5_free_unparsed_name(context, utf8_name);
+       return 0;
+}
+
 #ifndef HAVE_KRB5_SET_REAL_TIME
 /*
  * This function is not in the Heimdal mainline.
 }
 #endif
 
-#if defined(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES) && !defined(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES)
+#if !defined(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES)
+
+#if defined(HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES)
+
+/* With MIT kerberos, we should use krb5_set_default_tgs_enctypes in preference
+ * to krb5_set_default_tgs_ktypes. See
+ *         http://lists.samba.org/archive/samba-technical/2006-July/048271.html
+ *
+ * If the MIT libraries are not exporting internal symbols, we will end up in
+ * this branch, which is correct. Otherwise we will continue to use the
+ * internal symbol
+ */
+ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc)
+{
+    return krb5_set_default_tgs_enctypes(ctx, enc);
+}
+
+#elif defined(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES)
+
+/* Heimdal */
  krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc)
 {
        return krb5_set_default_in_tkt_etypes(ctx, enc);
 }
-#endif
+
+#endif /* HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES */
+
+#endif /* HAVE_KRB5_SET_DEFAULT_TGS_KTYPES */
 
 #if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS)
 /* HEIMDAL */
 #error UNKNOWN_ADDRTYPE
 #endif
 
-#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY)
+#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK)
  int create_kerberos_key_from_string_direct(krb5_context context,
                                        krb5_principal host_princ,
                                        krb5_data *password,
                DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret)));
                return ret;
        }
-       return krb5_string_to_key_salt(context, enctype, password->data,
-               salt, key);
+       
+       ret = krb5_string_to_key_salt(context, enctype, (const char *)password->data, salt, key);
+       krb5_free_salt(context, salt);
+       return ret;
 }
 #else
 #error UNKNOWN_CREATE_KEY_FUNCTIONS
 #error UNKNOWN_GET_ENCTYPES_FUNCTIONS
 #endif
 
- void free_kerberos_etypes(krb5_context context, 
-                          krb5_enctype *enctypes)
-{
-#if defined(HAVE_KRB5_FREE_KTYPES)
-       krb5_free_ktypes(context, enctypes);
-       return;
-#else
-       SAFE_FREE(enctypes);
-       return;
-#endif
-}
-
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
  krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
                                        krb5_auth_context auth_context,
 }
 #endif
 
- void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt)
+BOOL unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, 
+                          DATA_BLOB *edata, 
+                          DATA_BLOB *edata_out)
+{
+       DATA_BLOB edata_contents;
+       ASN1_DATA data;
+       int edata_type;
+
+       if (!edata->length) {
+               return False;
+       }
+
+       asn1_load(&data, *edata);
+       asn1_start_tag(&data, ASN1_SEQUENCE(0));
+       asn1_start_tag(&data, ASN1_CONTEXT(1));
+       asn1_read_Integer(&data, &edata_type);
+
+       if (edata_type != KRB5_PADATA_PW_SALT) {
+               DEBUG(0,("edata is not of required type %d but of type %d\n", 
+                       KRB5_PADATA_PW_SALT, edata_type));
+               asn1_free(&data);
+               return False;
+       }
+       
+       asn1_start_tag(&data, ASN1_CONTEXT(2));
+       asn1_read_OctetString(&data, &edata_contents);
+       asn1_end_tag(&data);
+       asn1_end_tag(&data);
+       asn1_end_tag(&data);
+       asn1_free(&data);
+
+       *edata_out = data_blob_talloc(mem_ctx, edata_contents.data, edata_contents.length);
+
+       data_blob_free(&edata_contents);
+
+       return True;
+}
+
+
+BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data)
+{
+       DATA_BLOB pac_contents;
+       ASN1_DATA data;
+       int data_type;
+
+       if (!auth_data->length) {
+               return False;
+       }
+
+       asn1_load(&data, *auth_data);
+       asn1_start_tag(&data, ASN1_SEQUENCE(0));
+       asn1_start_tag(&data, ASN1_SEQUENCE(0));
+       asn1_start_tag(&data, ASN1_CONTEXT(0));
+       asn1_read_Integer(&data, &data_type);
+       
+       if (data_type != KRB5_AUTHDATA_WIN2K_PAC ) {
+               DEBUG(10,("authorization data is not a Windows PAC (type: %d)\n", data_type));
+               asn1_free(&data);
+               return False;
+       }
+       
+       asn1_end_tag(&data);
+       asn1_start_tag(&data, ASN1_CONTEXT(1));
+       asn1_read_OctetString(&data, &pac_contents);
+       asn1_end_tag(&data);
+       asn1_end_tag(&data);
+       asn1_end_tag(&data);
+       asn1_free(&data);
+
+       *unwrapped_pac_data = data_blob_talloc(mem_ctx, pac_contents.data, pac_contents.length);
+
+       data_blob_free(&pac_contents);
+
+       return True;
+}
+
+ BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt)
 {
+       DATA_BLOB auth_data_wrapped;
+       BOOL got_auth_data_pac = False;
+       int i;
+       
 #if defined(HAVE_KRB5_TKT_ENC_PART2)
-       if (tkt->enc_part2)
-               *auth_data = data_blob(tkt->enc_part2->authorization_data[0]->contents,
-                       tkt->enc_part2->authorization_data[0]->length);
+       if (tkt->enc_part2 && tkt->enc_part2->authorization_data && 
+           tkt->enc_part2->authorization_data[0] && 
+           tkt->enc_part2->authorization_data[0]->length)
+       {
+               for (i = 0; tkt->enc_part2->authorization_data[i] != NULL; i++) {
+               
+                       if (tkt->enc_part2->authorization_data[i]->ad_type != 
+                           KRB5_AUTHDATA_IF_RELEVANT) {
+                               DEBUG(10,("get_auth_data_from_tkt: ad_type is %d\n", 
+                                       tkt->enc_part2->authorization_data[i]->ad_type));
+                               continue;
+                       }
+
+                       auth_data_wrapped = data_blob(tkt->enc_part2->authorization_data[i]->contents,
+                                                     tkt->enc_part2->authorization_data[i]->length);
+
+                       /* check if it is a PAC */
+                       got_auth_data_pac = unwrap_pac(mem_ctx, &auth_data_wrapped, auth_data);
+                       data_blob_free(&auth_data_wrapped);
+                       
+                       if (!got_auth_data_pac) {
+                               continue;
+                       }
+               }
+
+               return got_auth_data_pac;
+       }
+               
 #else
-       if (tkt->ticket.authorization_data && tkt->ticket.authorization_data->len)
-               *auth_data = data_blob(tkt->ticket.authorization_data->val->ad_data.data,
-                       tkt->ticket.authorization_data->val->ad_data.length);
+       if (tkt->ticket.authorization_data && 
+           tkt->ticket.authorization_data->len)
+       {
+               for (i = 0; i < tkt->ticket.authorization_data->len; i++) {
+                       
+                       if (tkt->ticket.authorization_data->val[i].ad_type != 
+                           KRB5_AUTHDATA_IF_RELEVANT) {
+                               DEBUG(10,("get_auth_data_from_tkt: ad_type is %d\n", 
+                                       tkt->ticket.authorization_data->val[i].ad_type));
+                               continue;
+                       }
+
+                       auth_data_wrapped = data_blob(tkt->ticket.authorization_data->val[i].ad_data.data,
+                                                     tkt->ticket.authorization_data->val[i].ad_data.length);
+
+                       /* check if it is a PAC */
+                       got_auth_data_pac = unwrap_pac(mem_ctx, &auth_data_wrapped, auth_data);
+                       data_blob_free(&auth_data_wrapped);
+                       
+                       if (!got_auth_data_pac) {
+                               continue;
+                       }
+               }
+
+               return got_auth_data_pac;
+       }
 #endif
+       return False;
 }
 
  krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt)
 }
 
 #if !defined(HAVE_KRB5_LOCATE_KDC)
- krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters)
+
+/* krb5_locate_kdc is an internal MIT symbol. MIT are not yet willing to commit
+ * to a public interface for this functionality, so we have to be able to live
+ * without it if the MIT libraries are hiding their internal symbols.
+ */
+
+#if defined(KRB5_KRBHST_INIT)
+/* Heimdal */
+ krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters)
 {
        krb5_krbhst_handle hnd;
        krb5_krbhst_info *hinfo;
 
        rc = krb5_krbhst_init(ctx, realm->data, KRB5_KRBHST_KDC, &hnd);
        if (rc) {
-               DEBUG(0, ("krb5_locate_kdc: krb5_krbhst_init failed (%s)\n", error_message(rc)));
+               DEBUG(0, ("smb_krb5_locate_kdc: krb5_krbhst_init failed (%s)\n", error_message(rc)));
                return rc;
        }
 
        krb5_krbhst_reset(ctx, hnd);
 
        if (!num_kdcs) {
-               DEBUG(0, ("krb5_locate_kdc: zero kdcs found !\n"));
+               DEBUG(0, ("smb_krb5_locate_kdc: zero kdcs found !\n"));
                krb5_krbhst_free(ctx, hnd);
                return -1;
        }
 
-       sa = malloc( sizeof(struct sockaddr) * num_kdcs );
+       sa = SMB_MALLOC_ARRAY( struct sockaddr, num_kdcs );
        if (!sa) {
-               DEBUG(0, ("krb5_locate_kdc: malloc failed\n"));
+               DEBUG(0, ("smb_krb5_locate_kdc: malloc failed\n"));
                krb5_krbhst_free(ctx, hnd);
                naddrs = 0;
                return -1;
        }
 
-       *addr_pp = malloc(sizeof(struct sockaddr) * num_kdcs);
-       memset(*addr_pp, '\0', sizeof(struct sockaddr) * num_kdcs );
+       memset(sa, '\0', sizeof(struct sockaddr) * num_kdcs );
 
        for (i = 0; i < num_kdcs && (rc = krb5_krbhst_next(ctx, hnd, &hinfo) == 0); i++) {
 
        *addr_pp = sa;
        return 0;
 }
-#endif
+
+#else /* ! defined(KRB5_KRBHST_INIT) */
+
+ krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
+               struct sockaddr **addr_pp, int *naddrs, int get_masters)
+{
+       DEBUG(0, ("unable to explicitly locate the KDC on this platform\n"));
+       return KRB5_KDC_UNREACH;
+}
+
+#endif /* KRB5_KRBHST_INIT */
+
+#else /* ! HAVE_KRB5_LOCATE_KDC */
+
+ krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
+               struct sockaddr **addr_pp, int *naddrs, int get_masters)
+{
+       return krb5_locate_kdc(ctx, realm, addr_pp, naddrs, get_masters);
+}
+
+#endif /* HAVE_KRB5_LOCATE_KDC */
 
 #if !defined(HAVE_KRB5_FREE_UNPARSED_NAME)
  void krb5_free_unparsed_name(krb5_context context, char *val)
@@ -313,9 +560,10 @@ static BOOL ads_cleanup_expired_creds(krb5_context context,
                                      krb5_creds  *credsp)
 {
        krb5_error_code retval;
+       const char *cc_type = krb5_cc_get_type(context, ccache);
 
-       DEBUG(3, ("Ticket in ccache[%s] expiration %s\n",
-                 krb5_cc_default_name(context),
+       DEBUG(3, ("ads_cleanup_expired_creds: Ticket in ccache[%s:%s] expiration %s\n",
+                 cc_type, krb5_cc_get_name(context, ccache),
                  http_timestring(credsp->times.endtime)));
 
        /* we will probably need new tickets if the current ones
@@ -329,14 +577,14 @@ static BOOL ads_cleanup_expired_creds(krb5_context context,
           use memory ccaches, and a FILE one probably means that
           we're using creds obtained outside of our exectuable
        */
-       if (StrCaseCmp(krb5_cc_get_type(context, ccache), "FILE") == 0) {
-               DEBUG(5, ("We do not remove creds from a FILE ccache\n"));
+       if (strequal(cc_type, "FILE")) {
+               DEBUG(5, ("ads_cleanup_expired_creds: We do not remove creds from a %s ccache\n", cc_type));
                return False;
        }
-       
+
        retval = krb5_cc_remove_cred(context, ccache, 0, credsp);
        if (retval) {
-               DEBUG(1, ("krb5_cc_remove_cred failed, err %s\n",
+               DEBUG(1, ("ads_cleanup_expired_creds: krb5_cc_remove_cred failed, err %s\n",
                          error_message(retval)));
                /* If we have an error in this, we want to display it,
                   but continue as though we deleted it */
@@ -352,7 +600,8 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
                                       const krb5_flags ap_req_options,
                                       const char *principal,
                                       krb5_ccache ccache, 
-                                      krb5_data *outbuf)
+                                      krb5_data *outbuf, 
+                                      time_t *expire_time)
 {
        krb5_error_code           retval;
        krb5_principal    server;
@@ -360,31 +609,35 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
        krb5_creds                creds;
        krb5_data in_data;
        BOOL creds_ready = False;
+       int i = 0, maxtries = 3;
        
-       retval = krb5_parse_name(context, principal, &server);
+       retval = smb_krb5_parse_name(context, principal, &server);
        if (retval) {
-               DEBUG(1,("Failed to parse principal %s\n", principal));
+               DEBUG(1,("ads_krb5_mk_req: Failed to parse principal %s\n", principal));
                return retval;
        }
        
        /* obtain ticket & session key */
        ZERO_STRUCT(creds);
        if ((retval = krb5_copy_principal(context, server, &creds.server))) {
-               DEBUG(1,("krb5_copy_principal failed (%s)\n", 
+               DEBUG(1,("ads_krb5_mk_req: krb5_copy_principal failed (%s)\n", 
                         error_message(retval)));
                goto cleanup_princ;
        }
        
        if ((retval = krb5_cc_get_principal(context, ccache, &creds.client))) {
-               DEBUG(1,("krb5_cc_get_principal failed (%s)\n", 
+               /* This can commonly fail on smbd startup with no ticket in the cache.
+                * Report at higher level than 1. */
+               DEBUG(3,("ads_krb5_mk_req: krb5_cc_get_principal failed (%s)\n", 
                         error_message(retval)));
                goto cleanup_creds;
        }
 
-       while(!creds_ready) {
+       while (!creds_ready && (i < maxtries)) {
+
                if ((retval = krb5_get_credentials(context, 0, ccache, 
                                                   &creds, &credsp))) {
-                       DEBUG(1,("krb5_get_credentials failed for %s (%s)\n",
+                       DEBUG(1,("ads_krb5_mk_req: krb5_get_credentials failed for %s (%s)\n",
                                 principal, error_message(retval)));
                        goto cleanup_creds;
                }
@@ -392,25 +645,32 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
                /* cope with ticket being in the future due to clock skew */
                if ((unsigned)credsp->times.starttime > time(NULL)) {
                        time_t t = time(NULL);
-                       int time_offset =(unsigned)credsp->times.starttime-t;
-                       DEBUG(4,("Advancing clock by %d seconds to cope with clock skew\n", time_offset));
+                       int time_offset =(int)((unsigned)credsp->times.starttime-t);
+                       DEBUG(4,("ads_krb5_mk_req: Advancing clock by %d seconds to cope with clock skew\n", time_offset));
                        krb5_set_real_time(context, t + time_offset + 1, 0);
                }
 
-               if (!ads_cleanup_expired_creds(context, ccache, credsp))
+               if (!ads_cleanup_expired_creds(context, ccache, credsp)) {
                        creds_ready = True;
+               }
+
+               i++;
        }
 
-       DEBUG(10,("Ticket (%s) in ccache (%s) is valid until: (%s - %d)\n",
-                 principal, krb5_cc_default_name(context),
+       DEBUG(10,("ads_krb5_mk_req: Ticket (%s) in ccache (%s:%s) is valid until: (%s - %u)\n",
+                 principal, krb5_cc_get_type(context, ccache), krb5_cc_get_name(context, ccache),
                  http_timestring((unsigned)credsp->times.endtime), 
                  (unsigned)credsp->times.endtime));
 
+       if (expire_time) {
+               *expire_time = (time_t)credsp->times.endtime;
+       }
+
        in_data.length = 0;
        retval = krb5_mk_req_extended(context, auth_context, ap_req_options, 
                                      &in_data, credsp, outbuf);
        if (retval) {
-               DEBUG(1,("krb5_mk_req_extended failed (%s)\n", 
+               DEBUG(1,("ads_krb5_mk_req: krb5_mk_req_extended failed (%s)\n", 
                         error_message(retval)));
        }
        
@@ -429,7 +689,10 @@ cleanup_princ:
   get a kerberos5 ticket for the given service 
 */
 int cli_krb5_get_ticket(const char *principal, time_t time_offset, 
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5)
+                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, 
+                       uint32 extra_ap_opts, const char *ccname, 
+                       time_t *tgs_expire)
+
 {
        krb5_error_code retval;
        krb5_data packet;
@@ -443,10 +706,11 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset,
                ENCTYPE_DES_CBC_MD5, 
                ENCTYPE_DES_CBC_CRC, 
                ENCTYPE_NULL};
-       
+
+       initialize_krb5_error_table();
        retval = krb5_init_context(&context);
        if (retval) {
-               DEBUG(1,("krb5_init_context failed (%s)\n", 
+               DEBUG(1,("cli_krb5_get_ticket: krb5_init_context failed (%s)\n", 
                         error_message(retval)));
                goto failed;
        }
@@ -455,23 +719,25 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset,
                krb5_set_real_time(context, time(NULL) + time_offset, 0);
        }
 
-       if ((retval = krb5_cc_default(context, &ccdef))) {
-               DEBUG(1,("krb5_cc_default failed (%s)\n",
+       if ((retval = krb5_cc_resolve(context, ccname ?
+                       ccname : krb5_cc_default_name(context), &ccdef))) {
+               DEBUG(1,("cli_krb5_get_ticket: krb5_cc_default failed (%s)\n",
                         error_message(retval)));
                goto failed;
        }
 
        if ((retval = krb5_set_default_tgs_ktypes(context, enc_types))) {
-               DEBUG(1,("krb5_set_default_tgs_ktypes failed (%s)\n",
+               DEBUG(1,("cli_krb5_get_ticket: krb5_set_default_tgs_ktypes failed (%s)\n",
                         error_message(retval)));
                goto failed;
        }
 
        if ((retval = ads_krb5_mk_req(context, 
                                        &auth_context, 
-                                       AP_OPTS_USE_SUBKEY
+                                       AP_OPTS_USE_SUBKEY | (krb5_flags)extra_ap_opts,
                                        principal,
-                                       ccdef, &packet))) {
+                                       ccdef, &packet,
+                                       tgs_expire))) {
                goto failed;
        }
 
@@ -505,7 +771,7 @@ failed:
        else
                err = krb5_auth_con_getlocalsubkey(context, auth_context, &skey);
        if (err == 0 && skey != NULL) {
-               DEBUG(10, ("Got KRB5 session key of length %d\n",  KRB5_KEY_LENGTH(skey)));
+               DEBUG(10, ("Got KRB5 session key of length %d\n",  (int)KRB5_KEY_LENGTH(skey)));
                *session_key = data_blob(KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey));
                dump_data_pw("KRB5 Session Key:\n", session_key->data, session_key->length);
 
@@ -521,12 +787,14 @@ failed:
 
 
 #if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING) && !defined(HAVE_KRB5_PRINC_COMPONENT)
+ const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i );
+
  const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i )
 {
        static krb5_data kdata;
 
-       kdata.data = krb5_principal_get_comp_string(context, principal, i);
-       kdata.length = strlen(kdata.data);
+       kdata.data = (char *)krb5_principal_get_comp_string(context, principal, i);
+       kdata.length = strlen((const char *)kdata.data);
        return &kdata;
 }
 #endif
@@ -542,10 +810,881 @@ failed:
 #endif
 }
 
+ void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum, 
+                                   PAC_SIGNATURE_DATA *sig)
+{
+#ifdef HAVE_CHECKSUM_IN_KRB5_CHECKSUM
+       cksum->cksumtype        = (krb5_cksumtype)sig->type;
+       cksum->checksum.length  = sig->signature.buf_len;
+       cksum->checksum.data    = sig->signature.buffer;
+#else
+       cksum->checksum_type    = (krb5_cksumtype)sig->type;
+       cksum->length           = sig->signature.buf_len;
+       cksum->contents         = sig->signature.buffer;
+#endif
+}
+
+ krb5_error_code smb_krb5_verify_checksum(krb5_context context,
+                                        krb5_keyblock *keyblock,
+                                        krb5_keyusage usage,
+                                        krb5_checksum *cksum,
+                                        uint8 *data,
+                                        size_t length)
+{
+       krb5_error_code ret;
+
+       /* verify the checksum */
+
+       /* welcome to the wonderful world of samba's kerberos abstraction layer:
+        * 
+        * function                     heimdal 0.6.1rc3        heimdal 0.7     MIT krb 1.4.2
+        * -----------------------------------------------------------------------------
+        * krb5_c_verify_checksum       -                       works           works
+        * krb5_verify_checksum         works (6 args)          works (6 args)  broken (7 args) 
+        */
+
+#if defined(HAVE_KRB5_C_VERIFY_CHECKSUM)
+       {
+               krb5_boolean checksum_valid = False;
+               krb5_data input;
+
+               input.data = (char *)data;
+               input.length = length;
+
+               ret = krb5_c_verify_checksum(context, 
+                                            keyblock, 
+                                            usage,
+                                            &input, 
+                                            cksum,
+                                            &checksum_valid);
+               if (ret) {
+                       DEBUG(3,("smb_krb5_verify_checksum: krb5_c_verify_checksum() failed: %s\n", 
+                               error_message(ret)));
+                       return ret;
+               }
+
+               if (!checksum_valid)
+                       ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
+       }
+
+#elif KRB5_VERIFY_CHECKSUM_ARGS == 6 && defined(HAVE_KRB5_CRYPTO_INIT) && defined(HAVE_KRB5_CRYPTO) && defined(HAVE_KRB5_CRYPTO_DESTROY)
+
+       /* Warning: MIT's krb5_verify_checksum cannot be used as it will use a key
+        * without enctype and it ignores any key_usage types - Guenther */
+
+       {
+
+               krb5_crypto crypto;
+               ret = krb5_crypto_init(context,
+                                      keyblock,
+                                      0,
+                                      &crypto);
+               if (ret) {
+                       DEBUG(0,("smb_krb5_verify_checksum: krb5_crypto_init() failed: %s\n", 
+                               error_message(ret)));
+                       return ret;
+               }
+
+               ret = krb5_verify_checksum(context,
+                                          crypto,
+                                          usage,
+                                          data,
+                                          length,
+                                          cksum);
+
+               krb5_crypto_destroy(context, crypto);
+       }
+
+#else
+#error UNKNOWN_KRB5_VERIFY_CHECKSUM_FUNCTION
+#endif
+
+       return ret;
+}
+
+ time_t get_authtime_from_tkt(krb5_ticket *tkt)
+{
+#if defined(HAVE_KRB5_TKT_ENC_PART2)
+       return tkt->enc_part2->times.authtime;
+#else
+       return tkt->ticket.authtime;
+#endif
+}
+
+#ifdef HAVE_KRB5_DECODE_AP_REQ /* Heimdal */
+static int get_kvno_from_ap_req(krb5_ap_req *ap_req)
+{
+#ifdef HAVE_TICKET_POINTER_IN_KRB5_AP_REQ /* MIT */
+       if (ap_req->ticket->enc_part.kvno)
+               return ap_req->ticket->enc_part.kvno;
+#else /* Heimdal */
+       if (ap_req->ticket.enc_part.kvno) 
+               return *ap_req->ticket.enc_part.kvno;
+#endif
+       return 0;
+}
+
+static krb5_enctype get_enctype_from_ap_req(krb5_ap_req *ap_req)
+{
+#ifdef HAVE_ETYPE_IN_ENCRYPTEDDATA /* Heimdal */
+       return ap_req->ticket.enc_part.etype;
+#else /* MIT */
+       return ap_req->ticket->enc_part.enctype;
+#endif
+}
+#endif /* HAVE_KRB5_DECODE_AP_REQ */
+
+static krb5_error_code
+get_key_from_keytab(krb5_context context,
+                   krb5_const_principal server,
+                   krb5_enctype enctype,
+                   krb5_kvno kvno,
+                   krb5_keyblock **out_key)
+{
+       krb5_keytab_entry entry;
+       krb5_error_code ret;
+       krb5_keytab keytab;
+       char *name = NULL;
+
+       /* We have to open a new keytab handle here, as MIT does
+          an implicit open/getnext/close on krb5_kt_get_entry. We
+          may be in the middle of a keytab enumeration when this is
+          called. JRA. */
+
+       ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
+       if (ret) {
+               DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+               return ret;
+       }
+
+       if ( DEBUGLEVEL >= 10 ) {
+               if (smb_krb5_unparse_name(context, server, &name) == 0) {
+                       DEBUG(10,("get_key_from_keytab: will look for kvno %d, enctype %d and name: %s\n", 
+                               kvno, enctype, name));
+                       SAFE_FREE(name);
+               }
+       }
+
+       ret = krb5_kt_get_entry(context,
+                               keytab,
+                               server,
+                               kvno,
+                               enctype,
+                               &entry);
+
+       if (ret) {
+               DEBUG(0,("get_key_from_keytab: failed to retrieve key: %s\n", error_message(ret)));
+               goto out;
+       }
+
+#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */
+       ret = krb5_copy_keyblock(context, &entry.keyblock, out_key);
+#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEY) /* MIT */
+       ret = krb5_copy_keyblock(context, &entry.key, out_key);
+#else
+#error UNKNOWN_KRB5_KEYTAB_ENTRY_FORMAT
+#endif
+
+       if (ret) {
+               DEBUG(0,("get_key_from_keytab: failed to copy key: %s\n", error_message(ret)));
+               goto out;
+       }
+               
+       smb_krb5_kt_free_entry(context, &entry);
+       
+out:    
+       krb5_kt_close(context, keytab);
+       return ret;
+}
+
+/* Prototypes */
+
+ krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, 
+                                                const krb5_data *inbuf, 
+                                                krb5_kvno *kvno, 
+                                                krb5_enctype *enctype)
+{
+#ifdef HAVE_KRB5_DECODE_AP_REQ /* Heimdal */
+       {
+               krb5_error_code ret;
+               krb5_ap_req ap_req;
+               
+               ret = krb5_decode_ap_req(context, inbuf, &ap_req);
+               if (ret)
+                       return ret;
+
+               *kvno = get_kvno_from_ap_req(&ap_req);
+               *enctype = get_enctype_from_ap_req(&ap_req);
+
+               free_AP_REQ(&ap_req);
+               return 0;
+       }
+#endif
+
+       /* Possibly not an appropriate error code. */
+       return KRB5KDC_ERR_BADOPTION;
+}
+
+ krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context,
+                                                       krb5_auth_context *auth_context,
+                                                       const krb5_data *inbuf,
+                                                       krb5_const_principal server,
+                                                       krb5_keytab keytab,
+                                                       krb5_flags *ap_req_options,
+                                                       krb5_ticket **ticket, 
+                                                       krb5_keyblock **keyblock)
+{
+       krb5_error_code ret;
+       krb5_kvno kvno;
+       krb5_enctype enctype;
+       krb5_keyblock *local_keyblock;
+
+       ret = krb5_rd_req(context, 
+                         auth_context, 
+                         inbuf, 
+                         server, 
+                         keytab, 
+                         ap_req_options, 
+                         ticket);
+       if (ret) {
+               return ret;
+       }
+       
+#ifdef KRB5_TICKET_HAS_KEYINFO
+       enctype = (*ticket)->enc_part.enctype;
+       kvno = (*ticket)->enc_part.kvno;
+#else
+       ret = smb_krb5_get_keyinfo_from_ap_req(context, inbuf, &kvno, &enctype);
+       if (ret) {
+               return ret;
+       }
+#endif
+
+       ret = get_key_from_keytab(context, 
+                                 server,
+                                 enctype,
+                                 kvno,
+                                 &local_keyblock);
+       if (ret) {
+               DEBUG(0,("krb5_rd_req_return_keyblock_from_keytab: failed to call get_key_from_keytab\n"));
+               goto out;
+       }
+
+out:
+       if (ret && local_keyblock != NULL) {
+               krb5_free_keyblock(context, local_keyblock);
+       } else {
+               *keyblock = local_keyblock;
+       }
+
+       return ret;
+}
+
+ krb5_error_code smb_krb5_parse_name_norealm(krb5_context context, 
+                                           const char *name, 
+                                           krb5_principal *principal)
+{
+#ifdef HAVE_KRB5_PARSE_NAME_NOREALM
+       return smb_krb5_parse_name_norealm_conv(context, name, principal);
+#endif
+
+       /* we are cheating here because parse_name will in fact set the realm.
+        * We don't care as the only caller of smb_krb5_parse_name_norealm
+        * ignores the realm anyway when calling
+        * smb_krb5_principal_compare_any_realm later - Guenther */
+
+       return smb_krb5_parse_name(context, name, principal);
+}
+
+ BOOL smb_krb5_principal_compare_any_realm(krb5_context context, 
+                                         krb5_const_principal princ1, 
+                                         krb5_const_principal princ2)
+{
+#ifdef HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM
+
+       return krb5_principal_compare_any_realm(context, princ1, princ2);
+
+/* krb5_princ_size is a macro in MIT */
+#elif defined(HAVE_KRB5_PRINC_SIZE) || defined(krb5_princ_size)
+
+       int i, len1, len2;
+       const krb5_data *p1, *p2;
+
+       len1 = krb5_princ_size(context, princ1);
+       len2 = krb5_princ_size(context, princ2);
+
+       if (len1 != len2)
+               return False;
+
+       for (i = 0; i < len1; i++) {
+
+               p1 = krb5_princ_component(context, CONST_DISCARD(krb5_principal, princ1), i);
+               p2 = krb5_princ_component(context, CONST_DISCARD(krb5_principal, princ2), i);
+
+               if (p1->length != p2->length || memcmp(p1->data, p2->data, p1->length))
+                       return False;
+       }
+
+       return True;
+#else
+#error NO_SUITABLE_PRINCIPAL_COMPARE_FUNCTION
+#endif
+}
+
+ krb5_error_code smb_krb5_renew_ticket(const char *ccache_string,      /* FILE:/tmp/krb5cc_0 */
+                                      const char *client_string,       /* gd@BER.SUSE.DE */
+                                      const char *service_string,      /* krbtgt/BER.SUSE.DE@BER.SUSE.DE */
+                                      time_t *expire_time)
+{
+       krb5_error_code ret;
+       krb5_context context = NULL;
+       krb5_ccache ccache = NULL;
+       krb5_principal client = NULL;
+       krb5_creds creds, creds_in, *creds_out = NULL;
+
+       ZERO_STRUCT(creds);
+       ZERO_STRUCT(creds_in);
+
+       initialize_krb5_error_table();
+       ret = krb5_init_context(&context);
+       if (ret) {
+               goto done;
+       }
+
+       if (!ccache_string) {
+               ccache_string = krb5_cc_default_name(context);
+       }
+
+       if (!ccache_string) {
+               ret = EINVAL;
+               goto done;
+       }
+
+       DEBUG(10,("smb_krb5_renew_ticket: using %s as ccache\n", ccache_string));
+
+       /* FIXME: we should not fall back to defaults */
+       ret = krb5_cc_resolve(context, CONST_DISCARD(char *, ccache_string), &ccache);
+       if (ret) {
+               goto done;
+       }
+
+       if (client_string) {
+               ret = smb_krb5_parse_name(context, client_string, &client);
+               if (ret) {
+                       goto done;
+               }
+       } else {
+               ret = krb5_cc_get_principal(context, ccache, &client);
+               if (ret) {
+                       goto done;
+               }
+       }
+
+#ifdef HAVE_KRB5_GET_RENEWED_CREDS     /* MIT */
+       {
+               ret = krb5_get_renewed_creds(context, &creds, client, ccache, CONST_DISCARD(char *, service_string));
+               if (ret) {
+                       DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred failed: %s\n", error_message(ret)));
+                       goto done;
+               }
+       }
+#elif defined(HAVE_KRB5_GET_KDC_CRED)  /* Heimdal */
+       {
+               krb5_kdc_flags flags;
+               krb5_realm *client_realm = NULL;
+
+               ret = krb5_copy_principal(context, client, &creds_in.client);
+               if (ret) {
+                       goto done;
+               }
+
+               if (service_string) {
+                       ret = smb_krb5_parse_name(context, service_string, &creds_in.server);
+                       if (ret) { 
+                               goto done;
+                       }
+               } else {
+                       /* build tgt service by default */
+                       client_realm = krb5_princ_realm(context, creds_in.client);
+                       if (!client_realm) {
+                               ret = ENOMEM;
+                               goto done;
+                       }
+                       ret = krb5_make_principal(context, &creds_in.server, *client_realm, KRB5_TGS_NAME, *client_realm, NULL);
+                       if (ret) {
+                               goto done;
+                       }
+               }
+
+               flags.i = 0;
+               flags.b.renewable = flags.b.renew = True;
+
+               ret = krb5_get_kdc_cred(context, ccache, flags, NULL, NULL, &creds_in, &creds_out);
+               if (ret) {
+                       DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred failed: %s\n", error_message(ret)));
+                       goto done;
+               }
+
+               creds = *creds_out;
+       }
+#else
+#error NO_SUITABLE_KRB5_TICKET_RENEW_FUNCTION_AVAILABLE
+#endif
+
+       /* hm, doesn't that create a new one if the old one wasn't there? - Guenther */
+       ret = krb5_cc_initialize(context, ccache, client);
+       if (ret) {
+               goto done;
+       }
+       
+       ret = krb5_cc_store_cred(context, ccache, &creds);
+
+       if (expire_time) {
+               *expire_time = (time_t) creds.times.endtime;
+       }
+
+done:
+       krb5_free_cred_contents(context, &creds_in);
+
+       if (creds_out) {
+               krb5_free_creds(context, creds_out);
+       } else {
+               krb5_free_cred_contents(context, &creds);
+       }
+
+       if (client) {
+               krb5_free_principal(context, client);
+       }
+       if (ccache) {
+               krb5_cc_close(context, ccache);
+       }
+       if (context) {
+               krb5_free_context(context);
+       }
+
+       return ret;
+}
+
+ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr)
+{
+       krb5_error_code ret = 0;
+       if (addr == NULL) {
+               return ret;
+       }
+#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
+       krb5_free_addresses(context, addr->addrs);
+#elif defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* Heimdal */
+       ret = krb5_free_addresses(context, addr->addrs);
+       SAFE_FREE(addr->addrs);
+#endif
+       SAFE_FREE(addr);
+       addr = NULL;
+       return ret;
+}
+
+ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr)
+{
+       krb5_error_code ret = 0;
+       nstring buf;
+#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
+       krb5_address **addrs = NULL;
+#elif defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* Heimdal */
+       krb5_addresses *addrs = NULL;
+#endif
+
+       *kerb_addr = (smb_krb5_addresses *)SMB_MALLOC(sizeof(smb_krb5_addresses));
+       if (*kerb_addr == NULL) {
+               return ENOMEM;
+       }
+
+       put_name(buf, global_myname(), ' ', 0x20);
+
+#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
+       {
+               int num_addr = 2;
+
+               addrs = (krb5_address **)SMB_MALLOC(sizeof(krb5_address *) * num_addr);
+               if (addrs == NULL) {
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               memset(addrs, 0, sizeof(krb5_address *) * num_addr);
+
+               addrs[0] = (krb5_address *)SMB_MALLOC(sizeof(krb5_address));
+               if (addrs[0] == NULL) {
+                       SAFE_FREE(addrs);
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               addrs[0]->magic = KV5M_ADDRESS;
+               addrs[0]->addrtype = KRB5_ADDR_NETBIOS;
+               addrs[0]->length = MAX_NETBIOSNAME_LEN;
+               addrs[0]->contents = (unsigned char *)SMB_MALLOC(addrs[0]->length);
+               if (addrs[0]->contents == NULL) {
+                       SAFE_FREE(addrs[0]);
+                       SAFE_FREE(addrs);
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               memcpy(addrs[0]->contents, buf, addrs[0]->length);
+
+               addrs[1] = NULL;
+       }
+#elif defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* Heimdal */
+       {
+               addrs = (krb5_addresses *)SMB_MALLOC(sizeof(krb5_addresses));
+               if (addrs == NULL) {
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               memset(addrs, 0, sizeof(krb5_addresses));
+
+               addrs->len = 1;
+               addrs->val = (krb5_address *)SMB_MALLOC(sizeof(krb5_address));
+               if (addrs->val == NULL) {
+                       SAFE_FREE(addrs);
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               addrs->val[0].addr_type = KRB5_ADDR_NETBIOS;
+               addrs->val[0].address.length = MAX_NETBIOSNAME_LEN;
+               addrs->val[0].address.data = (unsigned char *)SMB_MALLOC(addrs->val[0].address.length);
+               if (addrs->val[0].address.data == NULL) {
+                       SAFE_FREE(addrs->val);
+                       SAFE_FREE(addrs);
+                       SAFE_FREE(kerb_addr);
+                       return ENOMEM;
+               }
+
+               memcpy(addrs->val[0].address.data, buf, addrs->val[0].address.length);
+       }
+#else
+#error UNKNOWN_KRB5_ADDRESS_FORMAT
+#endif
+       (*kerb_addr)->addrs = addrs;
+
+       return ret;
+}
+
+ void smb_krb5_free_error(krb5_context context, krb5_error *krberror)
+{
+#ifdef HAVE_KRB5_FREE_ERROR_CONTENTS /* Heimdal */
+       krb5_free_error_contents(context, krberror);
+#else /* MIT */
+       krb5_free_error(context, krberror);
+#endif
+}
+
+ krb5_error_code handle_krberror_packet(krb5_context context,
+                                       krb5_data *packet)
+{
+       krb5_error_code ret;
+       BOOL got_error_code = False;
+
+       DEBUG(10,("handle_krberror_packet: got error packet\n"));
+       
+#ifdef HAVE_E_DATA_POINTER_IN_KRB5_ERROR /* Heimdal */
+       {
+               krb5_error krberror;
+
+               if ((ret = krb5_rd_error(context, packet, &krberror))) {
+                       DEBUG(10,("handle_krberror_packet: krb5_rd_error failed with: %s\n", 
+                               error_message(ret)));
+                       return ret;
+               }
+
+               if (krberror.e_data == NULL || krberror.e_data->data == NULL) {
+                       ret = (krb5_error_code) krberror.error_code;
+                       got_error_code = True;
+               }
+
+               smb_krb5_free_error(context, &krberror);
+       }
+#else /* MIT */
+       {
+               krb5_error *krberror;
+
+               if ((ret = krb5_rd_error(context, packet, &krberror))) {
+                       DEBUG(10,("handle_krberror_packet: krb5_rd_error failed with: %s\n", 
+                               error_message(ret)));
+                       return ret;
+               }
+
+               if (krberror->e_data.data == NULL) {
+                       ret = ERROR_TABLE_BASE_krb5 + (krb5_error_code) krberror->error;
+                       got_error_code = True;
+               }
+               smb_krb5_free_error(context, krberror);
+       }
+#endif
+       if (got_error_code) {
+               DEBUG(5,("handle_krberror_packet: got KERBERR from kpasswd: %s (%d)\n", 
+                       error_message(ret), ret));
+       }
+       return ret;
+}
+
+ krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
+                                           krb5_get_init_creds_opt **opt)
+{
+#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC
+       /* Heimdal or modern MIT version */
+       return krb5_get_init_creds_opt_alloc(context, opt);
+#else
+       /* Historical MIT version */
+       krb5_get_init_creds_opt *my_opt;
+
+       *opt = NULL;
+
+       if ((my_opt = SMB_MALLOC_P(krb5_get_init_creds_opt)) == NULL) {
+               return ENOMEM;
+       }
+
+       krb5_get_init_creds_opt_init(my_opt);
+
+       *opt =  my_opt;
+       return 0;
+#endif /* HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC  */
+}
+
+ void smb_krb5_get_init_creds_opt_free(krb5_context context,
+                               krb5_get_init_creds_opt *opt)
+{
+#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_FREE
+
+#ifdef KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT
+       /* Modern MIT or Heimdal version */
+       krb5_get_init_creds_opt_free(context, opt);
+#else
+       /* Heimdal version */
+       krb5_get_init_creds_opt_free(opt);
+#endif /* KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT */
+
+#else /* HAVE_KRB5_GET_INIT_CREDS_OPT_FREE */
+       /* Historical MIT version */
+       SAFE_FREE(opt);
+       opt = NULL;
+#endif /* HAVE_KRB5_GET_INIT_CREDS_OPT_FREE */
+}
+
+ krb5_enctype smb_get_enctype_from_kt_entry(const krb5_keytab_entry *kt_entry)
+{
+#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY              /* MIT */
+       return kt_entry->key.enctype;
+#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK) /* Heimdal */
+       return kt_entry->keyblock.keytype;
+#else
+#error UNKNOWN_KRB5_KEYTAB_ENTRY_KEYBLOCK_FORMAT
+#endif
+}
+
+
+/* caller needs to free etype_s */
+ krb5_error_code smb_krb5_enctype_to_string(krb5_context context, 
+                                           krb5_enctype enctype, 
+                                           char **etype_s)
+{
+#ifdef HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG
+       return krb5_enctype_to_string(context, enctype, etype_s); /* Heimdal */
+#elif defined(HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG)
+       char buf[256];
+       krb5_error_code ret = krb5_enctype_to_string(enctype, buf, 256); /* MIT */
+       if (ret) {
+               return ret;
+       }
+       *etype_s = SMB_STRDUP(buf);
+       if (!*etype_s) {
+               return ENOMEM;
+       }
+       return ret;
+#else
+#error UNKNOWN_KRB5_ENCTYPE_TO_STRING_FUNCTION
+#endif
+}
+
+ krb5_error_code smb_krb5_mk_error(krb5_context context,
+                               krb5_error_code error_code,
+                               const krb5_principal server,
+                               krb5_data *reply)
+{
+#ifdef HAVE_SHORT_KRB5_MK_ERROR_INTERFACE /* MIT */
+       /*
+        * The MIT interface is *terrible*.
+        * We have to construct this ourselves...
+        */
+       krb5_error e;
+
+       memset(&e, 0, sizeof(e));
+       krb5_us_timeofday(context, &e.stime, &e.susec);
+       e.server = server;
+#if defined(krb5_err_base)
+       e.error = error_code - krb5_err_base;
+#elif defined(ERROR_TABLE_BASE_krb5)
+       e.error = error_code - ERROR_TABLE_BASE_krb5;
+#else
+       e.error = error_code; /* Almost certainly wrong, but what can we do... ? */
+#endif
+
+       return krb5_mk_error(context, &e, reply);
+#else /* Heimdal. */
+       return krb5_mk_error(context,
+                               error_code,
+                               NULL,
+                               NULL, /* e_data */
+                               NULL,
+                               server,
+                               NULL,
+                               NULL,
+                               reply);
+#endif
+}
+
+/**********************************************************************
+ * Open a krb5 keytab with flags, handles readonly or readwrite access and
+ * allows to process non-default keytab names.
+ * @param context krb5_context 
+ * @param keytab_name_req string
+ * @param write_access BOOL if writable keytab is required
+ * @param krb5_keytab pointer to krb5_keytab (close with krb5_kt_close())
+ * @return krb5_error_code
+**********************************************************************/
+
+/* This MAX_NAME_LEN is a constant defined in krb5.h */
+#ifndef MAX_KEYTAB_NAME_LEN
+#define MAX_KEYTAB_NAME_LEN 1100
+#endif
+
+ krb5_error_code smb_krb5_open_keytab(krb5_context context,
+                                     const char *keytab_name_req,
+                                     BOOL write_access,
+                                     krb5_keytab *keytab)
+{
+       krb5_error_code ret = 0;
+       TALLOC_CTX *mem_ctx;
+       char keytab_string[MAX_KEYTAB_NAME_LEN];
+       BOOL found_valid_name = False;
+       const char *pragma = "FILE";
+       const char *tmp = NULL;
+
+       if (!write_access && !keytab_name_req) {
+               /* caller just wants to read the default keytab readonly, so be it */
+               return krb5_kt_default(context, keytab);
+       }
+
+       mem_ctx = talloc_init("smb_krb5_open_keytab");
+       if (!mem_ctx) {
+               return ENOMEM;
+       }
+
+#ifdef HAVE_WRFILE_KEYTAB 
+       if (write_access) {
+               pragma = "WRFILE";
+       }
+#endif
+
+       if (keytab_name_req) {
+
+               if (strlen(keytab_name_req) > MAX_KEYTAB_NAME_LEN) {
+                       ret = KRB5_CONFIG_NOTENUFSPACE;
+                       goto out;
+               }
+
+               if ((strncmp(keytab_name_req, "WRFILE:/", 8) == 0) || 
+                   (strncmp(keytab_name_req, "FILE:/", 6) == 0)) {
+                       tmp = keytab_name_req;
+                       goto resolve;
+               }
+
+               if (keytab_name_req[0] != '/') {
+                       ret = KRB5_KT_BADNAME;
+                       goto out;
+               }
+
+               tmp = talloc_asprintf(mem_ctx, "%s:%s", pragma, keytab_name_req);
+               if (!tmp) {
+                       ret = ENOMEM;
+                       goto out;
+               }
+
+               goto resolve;
+       }
+
+       /* we need to handle more complex keytab_strings, like:
+        * "ANY:FILE:/etc/krb5.keytab,krb4:/etc/srvtab" */
+
+       ret = krb5_kt_default_name(context, &keytab_string[0], MAX_KEYTAB_NAME_LEN - 2);
+       if (ret) {
+               goto out;
+       }
+
+       DEBUG(10,("smb_krb5_open_keytab: krb5_kt_default_name returned %s\n", keytab_string));
+
+       tmp = talloc_strdup(mem_ctx, keytab_string);
+       if (!tmp) {
+               ret = ENOMEM;
+               goto out;
+       }
+               
+       if (strncmp(tmp, "ANY:", 4) == 0) {
+               tmp += 4;
+       }
+
+       memset(&keytab_string, '\0', sizeof(keytab_string));
+
+       while (next_token(&tmp, keytab_string, ",", sizeof(keytab_string))) {
+
+               if (strncmp(keytab_string, "WRFILE:", 7) == 0) {
+                       found_valid_name = True;
+                       tmp = keytab_string;
+                       tmp += 7;
+               }
+
+               if (strncmp(keytab_string, "FILE:", 5) == 0) {
+                       found_valid_name = True;
+                       tmp = keytab_string;
+                       tmp += 5;
+               }
+
+               if (found_valid_name) {
+
+                       if (tmp[0] != '/') {
+                               ret = KRB5_KT_BADNAME;
+                               goto out;
+                       }
+
+                       tmp = talloc_asprintf(mem_ctx, "%s:%s", pragma, tmp);
+                       if (!tmp) {
+                               ret = ENOMEM;
+                               goto out;
+                       }
+                       break;
+               }
+       }
+               
+       if (!found_valid_name) {
+               ret = KRB5_KT_UNKNOWN_TYPE;
+               goto out;
+       }
+
+ resolve:
+       DEBUG(10,("smb_krb5_open_keytab: resolving: %s\n", tmp));
+       ret = krb5_kt_resolve(context, tmp, keytab);
+
+ out:
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
 #else /* HAVE_KRB5 */
  /* this saves a few linking headaches */
-int cli_krb5_get_ticket(const char *principal, time_t time_offset, 
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5) 
+ int cli_krb5_get_ticket(const char *principal, time_t time_offset, 
+                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts,
+                       const char *ccname, time_t *tgs_expire) 
 {
         DEBUG(0,("NO KERBEROS SUPPORT\n"));
         return 1;