More conversions of NULL -> talloc_autofree_context()
[ira/wip.git] / source3 / libsmb / clikrb5.c
index 55a705d7f0ff71f54c59539938c857dee99a6fa6..152c23bd150c39f679ef563c8a2fecde0b3ab2ae 100644 (file)
@@ -4,11 +4,11 @@
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Luke Howard 2002-2003
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
-   Copyright (C) Guenther Deschner 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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define KRB5_PRIVATE    1       /* this file uses PRIVATE interfaces! */
 
 #ifdef HAVE_KRB5
 
-#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE
-#define KRB5_KEY_TYPE(k)       ((k)->keytype)
-#define KRB5_KEY_LENGTH(k)     ((k)->keyvalue.length)
-#define KRB5_KEY_DATA(k)       ((k)->keyvalue.data)
-#else
-#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 */
+#define GSSAPI_CHECKSUM      0x8003             /* Checksum type value for Kerberos */
+#define GSSAPI_BNDLENGTH     16                 /* Bind Length (rfc-1964 pg.3) */
+#define GSSAPI_CHECKSUM_SIZE (12+GSSAPI_BNDLENGTH)
+
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY)
+static krb5_error_code ads_krb5_get_fwd_ticket( krb5_context context,
+                                         krb5_auth_context *auth_context,
+                                         krb5_creds *credsp,
+                                         krb5_ccache ccache,
+                                         krb5_data *authenticator);
+#endif
+
+/**************************************************************
+ 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;
+       size_t converted_size;
+
+       if (!push_utf8_talloc(talloc_tos(), &utf8_name, name, &converted_size)) {
+               return ENOMEM;
+       }
+
+       ret = krb5_parse_name(context, utf8_name, principal);
+       TALLOC_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;
+       size_t converted_size;
+
+       *principal = NULL;
+       if (!push_utf8_talloc(talloc_tos(), &utf8_name, name, &converted_size)) {
+               return ENOMEM;
+       }
+
+       ret = krb5_parse_name_norealm(context, utf8_name, principal);
+       TALLOC_FREE(utf8_name);
+       return ret;
+}
+#endif
+
+/**************************************************************
+ krb5_parse_name that returns a UNIX charset name. Must
+ be freed with talloc_free() call.
+**************************************************************/
+
+krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
+                                     krb5_context context,
+                                     krb5_const_principal principal,
+                                     char **unix_name)
+{
+       krb5_error_code ret;
+       char *utf8_name;
+       size_t converted_size;
+
+       *unix_name = NULL;
+       ret = krb5_unparse_name(context, principal, &utf8_name);
+       if (ret) {
+               return ret;
+       }
+
+       if (!pull_utf8_talloc(mem_ctx, unix_name, utf8_name, &converted_size)) {
+               krb5_free_unparsed_name(context, utf8_name);
+               return ENOMEM;
+       }
+       krb5_free_unparsed_name(context, utf8_name);
+       return 0;
+}
 
 #ifndef HAVE_KRB5_SET_REAL_TIME
 /*
 }
 #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 */
void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr)
bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr)
 {
-       pkaddr->addr_type = KRB5_ADDRESS_INET;
-       pkaddr->address.length = sizeof(((struct sockaddr_in *)paddr)->sin_addr);
-       pkaddr->address.data = (char *)&(((struct sockaddr_in *)paddr)->sin_addr);
+       memset(pkaddr, '\0', sizeof(krb5_address));
+#if defined(HAVE_IPV6) && defined(KRB5_ADDRESS_INET6)
+       if (paddr->ss_family == AF_INET6) {
+               pkaddr->addr_type = KRB5_ADDRESS_INET6;
+               pkaddr->address.length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
+               pkaddr->address.data = (char *)&(((struct sockaddr_in6 *)paddr)->sin6_addr);
+               return true;
+       }
+#endif
+       if (paddr->ss_family == AF_INET) {
+               pkaddr->addr_type = KRB5_ADDRESS_INET;
+               pkaddr->address.length = sizeof(((struct sockaddr_in *)paddr)->sin_addr);
+               pkaddr->address.data = (char *)&(((struct sockaddr_in *)paddr)->sin_addr);
+               return true;
+       }
+       return false;
 }
 #elif defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS)
 /* MIT */
void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr)
bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr)
 {
-       pkaddr->addrtype = ADDRTYPE_INET;
-       pkaddr->length = sizeof(((struct sockaddr_in *)paddr)->sin_addr);
-       pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in *)paddr)->sin_addr);
+       memset(pkaddr, '\0', sizeof(krb5_address));
+#if defined(HAVE_IPV6) && defined(ADDRTYPE_INET6)
+       if (paddr->ss_family == AF_INET6) {
+               pkaddr->addrtype = ADDRTYPE_INET6;
+               pkaddr->length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
+               pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in6 *)paddr)->sin6_addr);
+               return true;
+       }
+#endif
+       if (paddr->ss_family == AF_INET) {
+               pkaddr->addrtype = ADDRTYPE_INET;
+               pkaddr->length = sizeof(((struct sockaddr_in *)paddr)->sin_addr);
+               pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in *)paddr)->sin_addr);
+               return true;
+       }
+       return false;
 }
 #else
 #error UNKNOWN_ADDRTYPE
 #endif
 
 #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,
-                                       krb5_keyblock *key,
-                                       krb5_enctype enctype)
+static int create_kerberos_key_from_string_direct(krb5_context context,
+                                                 krb5_principal host_princ,
+                                                 krb5_data *password,
+                                                 krb5_keyblock *key,
+                                                 krb5_enctype enctype)
 {
-       int ret;
+       int ret = 0;
        krb5_data salt;
        krb5_encrypt_block eblock;
 
        krb5_use_enctype(context, &eblock, enctype);
        ret = krb5_string_to_key(context, &eblock, key, password, &salt);
        SAFE_FREE(salt.data);
+
        return ret;
 }
 #elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT)
- int create_kerberos_key_from_string_direct(krb5_context context,
-                                       krb5_principal host_princ,
-                                       krb5_data *password,
-                                       krb5_keyblock *key,
-                                       krb5_enctype enctype)
+static int create_kerberos_key_from_string_direct(krb5_context context,
+                                                 krb5_principal host_princ,
+                                                 krb5_data *password,
+                                                 krb5_keyblock *key,
+                                                 krb5_enctype enctype)
 {
        int ret;
        krb5_salt salt;
                DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret)));
                return ret;
        }
-       
-       ret = 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
                                        krb5_principal host_princ,
                                        krb5_data *password,
                                        krb5_keyblock *key,
-                                       krb5_enctype enctype)
+                                       krb5_enctype enctype,
+                                       bool no_salt)
 {
        krb5_principal salt_princ = NULL;
        int ret;
         * principal/enctype in a non-obvious way.  If it is, try to match
         * its behavior.
         */
+       if (no_salt) {
+               KRB5_KEY_DATA(key) = (KRB5_KEY_DATA_CAST *)SMB_MALLOC(password->length);
+               if (!KRB5_KEY_DATA(key)) {
+                       return ENOMEM;
+               }
+               memcpy(KRB5_KEY_DATA(key), password->data, password->length);
+               KRB5_KEY_LENGTH(key) = password->length;
+               KRB5_KEY_TYPE(key) = enctype;
+               return 0;
+       }
        salt_princ = kerberos_fetch_salt_princ_for_host_princ(context, host_princ, enctype);
        ret = create_kerberos_key_from_string_direct(context, salt_princ ? salt_princ : host_princ, password, key, enctype);
        if (salt_princ) {
 #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
 
-BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data)
+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;
+       }
+
+       data = asn1_init(mem_ctx);
+       if (data == NULL) {
+               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, talloc_autofree_context(), &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;
+       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);
+       data = asn1_init(mem_ctx);
+       if (data == NULL) {
+               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);
+               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);
+       asn1_end_tag(data);
+       asn1_start_tag(data, ASN1_CONTEXT(1));
+       asn1_read_OctetString(data, talloc_autofree_context(), &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);
 
@@ -225,10 +402,10 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
        return True;
 }
 
BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt)
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;
+       bool got_auth_data_pac = False;
        int i;
        
 #if defined(HAVE_KRB5_TKT_ENC_PART2)
@@ -251,9 +428,9 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
                        /* 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;
+
+                       if (got_auth_data_pac) {
+                               return true;
                        }
                }
 
@@ -279,9 +456,9 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
                        /* 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;
+
+                       if (got_auth_data_pac) {
+                               return true;
                        }
                }
 
@@ -301,7 +478,15 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 }
 
 #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;
@@ -315,7 +500,7 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 
        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;
        }
 
@@ -325,14 +510,14 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
        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 = 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;
@@ -359,7 +544,27 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
        *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)
@@ -390,7 +595,7 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 #endif
 }
 
BOOL kerberos_compatible_enctypes(krb5_context context,
bool kerberos_compatible_enctypes(krb5_context context,
                                  krb5_enctype enctype1,
                                  krb5_enctype enctype2)
 {
@@ -404,7 +609,7 @@ BOOL unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 #endif
 }
 
-static BOOL ads_cleanup_expired_creds(krb5_context context, 
+static bool ads_cleanup_expired_creds(krb5_context context, 
                                      krb5_ccache  ccache,
                                      krb5_creds  *credsp)
 {
@@ -413,7 +618,7 @@ static BOOL ads_cleanup_expired_creds(krb5_context 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)));
+                 http_timestring(talloc_tos(), credsp->times.endtime)));
 
        /* we will probably need new tickets if the current ones
           will expire within 10 seconds.
@@ -426,7 +631,7 @@ 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 (strequal(cc_type, "KCM") || strequal(cc_type, "FILE")) {
+       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;
        }
@@ -449,17 +654,20 @@ 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;
        krb5_creds              * credsp;
        krb5_creds                creds;
        krb5_data in_data;
-       BOOL creds_ready = False;
+       bool creds_ready = False;
        int i = 0, maxtries = 3;
        
-       retval = krb5_parse_name(context, principal, &server);
+       ZERO_STRUCT(in_data);
+
+       retval = smb_krb5_parse_name(context, principal, &server);
        if (retval) {
                DEBUG(1,("ads_krb5_mk_req: Failed to parse principal %s\n", principal));
                return retval;
@@ -482,6 +690,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
        }
 
        while (!creds_ready && (i < maxtries)) {
+
                if ((retval = krb5_get_credentials(context, 0, ccache, 
                                                   &creds, &credsp))) {
                        DEBUG(1,("ads_krb5_mk_req: krb5_get_credentials failed for %s (%s)\n",
@@ -497,25 +706,91 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
                        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,("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), 
+                 http_timestring(talloc_tos(), (unsigned)credsp->times.endtime), 
                  (unsigned)credsp->times.endtime));
 
-       in_data.length = 0;
+       if (expire_time) {
+               *expire_time = (time_t)credsp->times.endtime;
+       }
+
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY)
+       if( credsp->ticket_flags & TKT_FLG_OK_AS_DELEGATE ) {
+               /* Fetch a forwarded TGT from the KDC so that we can hand off a 2nd ticket
+                as part of the kerberos exchange. */
+
+               DEBUG( 3, ("ads_krb5_mk_req: server marked as OK to delegate to, building forwardable TGT\n")  );
+
+               if( *auth_context == NULL ) {
+                       /* Allocate if it has not yet been allocated. */
+                       retval = krb5_auth_con_init( context, auth_context );
+                       if (retval) {
+                               DEBUG(1,("ads_krb5_mk_req: krb5_auth_con_init failed (%s)\n",
+                                       error_message(retval)));
+                               goto cleanup_creds;
+                       }
+               }
+
+               retval = krb5_auth_con_setuseruserkey( context, *auth_context, &credsp->keyblock );
+               if (retval) {
+                       DEBUG(1,("ads_krb5_mk_req: krb5_auth_con_setuseruserkey failed (%s)\n",
+                               error_message(retval)));
+                       goto cleanup_creds;
+               }
+
+               /* Must use a subkey for forwarded tickets. */
+               retval = krb5_auth_con_setflags( context, *auth_context, KRB5_AUTH_CONTEXT_USE_SUBKEY);
+               if (retval) {
+                       DEBUG(1,("ads_krb5_mk_req: krb5_auth_con_setflags failed (%s)\n",
+                               error_message(retval)));
+                       goto cleanup_creds;
+               }
+
+               retval = ads_krb5_get_fwd_ticket( context,
+                                               auth_context,
+                                               credsp,
+                                               ccache,
+                                               &in_data );
+               if (retval) {
+                       DEBUG( 3, ("ads_krb5_get_fwd_ticket failed (%s)\n",
+                                  error_message( retval ) ) );
+
+                       /*
+                        * This is not fatal. Delete the *auth_context and continue
+                        * with krb5_mk_req_extended to get a non-forwardable ticket.
+                        */
+
+                       if (in_data.data) {
+                               free( in_data.data );
+                               in_data.data = NULL;
+                               in_data.length = 0;
+                       }
+                       krb5_auth_con_free(context, *auth_context);
+                       *auth_context = NULL;
+               }
+       }
+#endif
+
        retval = krb5_mk_req_extended(context, auth_context, ap_req_options, 
                                      &in_data, credsp, outbuf);
        if (retval) {
                DEBUG(1,("ads_krb5_mk_req: krb5_mk_req_extended failed (%s)\n", 
                         error_message(retval)));
        }
-       
+
+       if (in_data.data) {
+               free( in_data.data );
+               in_data.length = 0;
+       }
+
        krb5_free_creds(context, credsp);
 
 cleanup_creds:
@@ -532,7 +807,9 @@ cleanup_princ:
 */
 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)
+                       uint32 extra_ap_opts, const char *ccname, 
+                       time_t *tgs_expire)
+
 {
        krb5_error_code retval;
        krb5_data packet;
@@ -576,7 +853,8 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset,
                                        &auth_context, 
                                        AP_OPTS_USE_SUBKEY | (krb5_flags)extra_ap_opts,
                                        principal,
-                                       ccdef, &packet))) {
+                                       ccdef, &packet,
+                                       tgs_expire))) {
                goto failed;
        }
 
@@ -599,26 +877,32 @@ failed:
        return retval;
 }
 
BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote)
bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote)
  {
-       krb5_keyblock *skey;
-       krb5_error_code err;
-       BOOL ret = False;
+       krb5_keyblock *skey = NULL;
+       krb5_error_code err = 0;
+       bool ret = false;
 
-       if (remote)
+       if (remote) {
                err = krb5_auth_con_getremotesubkey(context, auth_context, &skey);
-       else
+       } 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)));
-               *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);
+       }
 
-               ret = True;
+       if (err || skey == NULL) {
+               DEBUG(10, ("KRB5 error getting session key %d\n", err));
+               goto done;
+       }
+
+       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);
 
+       ret = true;
+
+ done:
+       if (skey) {
                krb5_free_keyblock(context, skey);
-       } else {
-               DEBUG(10, ("KRB5 error getting session key %d\n", err));
        }
 
        return ret;
@@ -633,38 +917,43 @@ failed:
        static krb5_data kdata;
 
        kdata.data = (char *)krb5_principal_get_comp_string(context, principal, i);
-       kdata.length = strlen(kdata.data);
+       kdata.length = strlen((const char *)kdata.data);
        return &kdata;
 }
 #endif
 
  krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry)
 {
-#if defined(HAVE_KRB5_KT_FREE_ENTRY)
-       return krb5_kt_free_entry(context, kt_entry);
-#elif defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
+/* Try krb5_free_keytab_entry_contents first, since 
+ * MIT Kerberos >= 1.7 has both krb5_free_keytab_entry_contents and 
+ * krb5_kt_free_entry but only has a prototype for the first, while the 
+ * second is considered private. 
+ */
+#if defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
        return krb5_free_keytab_entry_contents(context, kt_entry);
+#elif defined(HAVE_KRB5_KT_FREE_ENTRY)
+       return krb5_kt_free_entry(context, kt_entry);
 #else
 #error UNKNOWN_KT_FREE_FUNCTION
 #endif
 }
 
- void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum, 
-                                   PAC_SIGNATURE_DATA *sig)
+ void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum,
+                                    struct 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;
+       cksum->checksum.length  = sig->signature.length;
+       cksum->checksum.data    = sig->signature.data;
 #else
        cksum->checksum_type    = (krb5_cksumtype)sig->type;
-       cksum->length           = sig->signature.buf_len;
-       cksum->contents         = sig->signature.buffer;
+       cksum->length           = sig->signature.length;
+       cksum->contents         = sig->signature.data;
 #endif
 }
 
  krb5_error_code smb_krb5_verify_checksum(krb5_context context,
-                                        krb5_keyblock *keyblock,
+                                         const krb5_keyblock *keyblock,
                                         krb5_keyusage usage,
                                         krb5_checksum *cksum,
                                         uint8 *data,
@@ -750,6 +1039,7 @@ failed:
 #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 */
@@ -770,6 +1060,7 @@ static krb5_enctype get_enctype_from_ap_req(krb5_ap_req *ap_req)
        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,
@@ -782,23 +1073,25 @@ get_key_from_keytab(krb5_context context,
        krb5_error_code ret;
        krb5_keytab keytab;
        char *name = NULL;
+       krb5_keyblock *keyp;
 
        /* 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 = krb5_kt_default(context, &keytab);
+       ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
        if (ret) {
-               DEBUG(0,("get_key_from_keytab: failed to open keytab: %s\n", error_message(ret)));
+               DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
                return ret;
        }
 
        if ( DEBUGLEVEL >= 10 ) {
-               krb5_unparse_name(context, server, &name);
-               DEBUG(10,("get_key_from_keytab: will look for kvno %d, enctype %d and name: %s\n", 
-                       kvno, enctype, name));
-               krb5_free_unparsed_name(context, name);
+               if (smb_krb5_unparse_name(talloc_tos(), context, server, &name) == 0) {
+                       DEBUG(10,("get_key_from_keytab: will look for kvno %d, enctype %d and name: %s\n", 
+                               kvno, enctype, name));
+                       TALLOC_FREE(name);
+               }
        }
 
        ret = krb5_kt_get_entry(context,
@@ -813,14 +1106,9 @@ get_key_from_keytab(krb5_context context,
                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
+       keyp = KRB5_KT_KEY(&entry);
 
+       ret = krb5_copy_keyblock(context, keyp, out_key);
        if (ret) {
                DEBUG(0,("get_key_from_keytab: failed to copy key: %s\n", error_message(ret)));
                goto out;
@@ -833,31 +1121,16 @@ out:
        return ret;
 }
 
- void smb_krb5_free_ap_req(krb5_context context, 
-                         krb5_ap_req *ap_req)
-{
-#ifdef HAVE_KRB5_FREE_AP_REQ /* MIT */
-       krb5_free_ap_req(context, ap_req);
-#elif defined(HAVE_FREE_AP_REQ) /* Heimdal */
-       free_AP_REQ(ap_req);
-#else
-#error UNKNOWN_KRB5_AP_REQ_FREE_FUNCTION
-#endif
-}
-
 /* Prototypes */
-#if defined(HAVE_DECODE_KRB5_AP_REQ) /* MIT */
-krb5_error_code decode_krb5_ap_req(const krb5_data *code, krb5_ap_req **rep);
-#endif
 
  krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, 
                                                 const krb5_data *inbuf, 
                                                 krb5_kvno *kvno, 
                                                 krb5_enctype *enctype)
 {
-       krb5_error_code ret;
 #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);
@@ -867,25 +1140,13 @@ krb5_error_code decode_krb5_ap_req(const krb5_data *code, krb5_ap_req **rep);
                *kvno = get_kvno_from_ap_req(&ap_req);
                *enctype = get_enctype_from_ap_req(&ap_req);
 
-               smb_krb5_free_ap_req(context, &ap_req);
-       }
-#elif defined(HAVE_DECODE_KRB5_AP_REQ) /* MIT */
-       {
-               krb5_ap_req *ap_req = NULL;
-
-               ret = decode_krb5_ap_req(inbuf, &ap_req);
-               if (ret)
-                       return ret;
-               
-               *kvno = get_kvno_from_ap_req(ap_req);
-               *enctype = get_enctype_from_ap_req(ap_req);
-
-               smb_krb5_free_ap_req(context, ap_req);
+               free_AP_REQ(&ap_req);
+               return 0;
        }
-#else
-#error UNKOWN_KRB5_AP_REQ_DECODING_FUNCTION
 #endif
-       return ret;
+
+       /* Possibly not an appropriate error code. */
+       return KRB5KDC_ERR_BADOPTION;
 }
 
  krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context,
@@ -898,7 +1159,6 @@ krb5_error_code decode_krb5_ap_req(const krb5_data *code, krb5_ap_req **rep);
                                                        krb5_keyblock **keyblock)
 {
        krb5_error_code ret;
-       krb5_ap_req *ap_req = NULL;
        krb5_kvno kvno;
        krb5_enctype enctype;
        krb5_keyblock *local_keyblock;
@@ -914,10 +1174,15 @@ krb5_error_code decode_krb5_ap_req(const krb5_data *code, krb5_ap_req **rep);
                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,
@@ -930,10 +1195,6 @@ krb5_error_code decode_krb5_ap_req(const krb5_data *code, krb5_ap_req **rep);
        }
 
 out:
-       if (ap_req) {
-               smb_krb5_free_ap_req(context, ap_req);
-       }
-
        if (ret && local_keyblock != NULL) {
                krb5_free_keyblock(context, local_keyblock);
        } else {
@@ -948,7 +1209,7 @@ out:
                                            krb5_principal *principal)
 {
 #ifdef HAVE_KRB5_PARSE_NAME_NOREALM
-       return krb5_parse_name_norealm(context, name, principal);
+       return smb_krb5_parse_name_norealm_conv(context, name, principal);
 #endif
 
        /* we are cheating here because parse_name will in fact set the realm.
@@ -956,10 +1217,10 @@ out:
         * ignores the realm anyway when calling
         * smb_krb5_principal_compare_any_realm later - Guenther */
 
-       return krb5_parse_name(context, name, principal);
+       return smb_krb5_parse_name(context, name, principal);
 }
 
BOOL smb_krb5_principal_compare_any_realm(krb5_context context, 
bool smb_krb5_principal_compare_any_realm(krb5_context context, 
                                          krb5_const_principal princ1, 
                                          krb5_const_principal princ2)
 {
@@ -997,12 +1258,16 @@ out:
  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 *new_start_time)
+                                      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);
@@ -1014,6 +1279,11 @@ out:
                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 */
@@ -1022,71 +1292,48 @@ out:
                goto done;
        }
 
-#ifdef HAVE_KRB5_GET_RENEWED_CREDS     /* MIT */
-       {
-               krb5_creds creds;
-       
-               if (client_string) {
-                       ret = krb5_parse_name(context, client_string, &client);
-                       if (ret) {
-                               goto done;
-                       }
-               } else {
-                       ret = krb5_cc_get_principal(context, ccache, &client);
-                       if (ret) {
-                               goto done;
-                       }
-               }
-       
-               ret = krb5_get_renewed_creds(context, &creds, client, ccache, CONST_DISCARD(char *, service_string));
+       if (client_string) {
+               ret = smb_krb5_parse_name(context, client_string, &client);
                if (ret) {
-                       DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred failed: %s\n", error_message(ret)));
                        goto done;
                }
-
-               /* hm, doesn't that create a new one if the old one wasn't there? - Guenther */
-               ret = krb5_cc_initialize(context, ccache, client);
+       } else {
+               ret = krb5_cc_get_principal(context, ccache, &client);
                if (ret) {
                        goto done;
                }
-       
-               ret = krb5_cc_store_cred(context, ccache, &creds);
+       }
 
-               if (new_start_time) {
-                       *new_start_time = (time_t) creds.times.renew_till;
+#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;
                }
-
-               krb5_free_cred_contents(context, &creds);
        }
 #elif defined(HAVE_KRB5_GET_KDC_CRED)  /* Heimdal */
        {
                krb5_kdc_flags flags;
-               krb5_creds creds_in;
-               krb5_realm *client_realm;
-               krb5_creds *creds;
-
-               memset(&creds_in, 0, sizeof(creds_in));
+               krb5_realm *client_realm = NULL;
 
-               if (client_string) {
-                       ret = krb5_parse_name(context, client_string, &creds_in.client);
-                       if (ret) {
-                               goto done;
-                       }
-               } else {
-                       ret = krb5_cc_get_principal(context, ccache, &creds_in.client);
-                       if (ret) {
-                               goto done;
-                       }
+               ret = krb5_copy_principal(context, client, &creds_in.client);
+               if (ret) {
+                       goto done;
                }
 
                if (service_string) {
-                       ret = krb5_parse_name(context, service_string, &creds_in.server);
+                       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, client);
+                       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;
@@ -1096,52 +1343,605 @@ out:
                flags.i = 0;
                flags.b.renewable = flags.b.renew = True;
 
-               ret = krb5_get_kdc_cred(context, ccache, flags, NULL, NULL, &creds_in, &creds);
+               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;
                }
-               
-               /* hm, doesn't that create a new one if the old one wasn't there? - Guenther */
-               ret = krb5_cc_initialize(context, ccache, creds_in.client);
-               if (ret) {
-                       goto done;
-               }
-       
-               ret = krb5_cc_store_cred(context, ccache, creds);
 
-               if (new_start_time) {
-                       *new_start_time = (time_t) creds->times.renew_till;
-               }
-                                               
-               krb5_free_cred_contents(context, &creds_in);
-               krb5_free_creds(context, creds);
+               creds = *creds_out;
        }
 #else
-#error No suitable krb5 ticket renew function available
+#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);
        }
-       if (ccache) {
-               krb5_cc_close(context, ccache);
+
+       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(krb5_keytab_entry *kt_entry)
+{
+       return KRB5_KEY_TYPE(KRB5_KT_KEY(kt_entry));
+}
+
+
+/* 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];
+       char *kt_str = NULL;
+       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_talloc(mem_ctx, &tmp, &kt_str, ",")) {
+               if (strncmp(kt_str, "WRFILE:", 7) == 0) {
+                       found_valid_name = True;
+                       tmp = kt_str;
+                       tmp += 7;
+               }
+
+               if (strncmp(kt_str, "FILE:", 5) == 0) {
+                       found_valid_name = True;
+                       tmp = kt_str;
+                       tmp += 5;
+               }
+
+               if (tmp[0] == '/') {
+                       /* Treat as a FILE: keytab definition. */
+                       found_valid_name = true;
+               }
+
+               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;
+}
+
+krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
+                                    krb5_context context,
+                                    krb5_keytab keytab,
+                                    const char **keytab_name)
+{
+       char keytab_string[MAX_KEYTAB_NAME_LEN];
+       krb5_error_code ret = 0;
+
+       ret = krb5_kt_get_name(context, keytab,
+                              keytab_string, MAX_KEYTAB_NAME_LEN - 2);
+       if (ret) {
+               return ret;
+       }
+
+       *keytab_name = talloc_strdup(mem_ctx, keytab_string);
+       if (!*keytab_name) {
+               return ENOMEM;
        }
 
        return ret;
-    
 }
 
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY)
+/**************************************************************
+Routine: ads_krb5_get_fwd_ticket
+ Description:
+    When a service ticket is flagged as trusted
+    for delegation we should provide a forwardable
+    ticket so that the remote host can act on our
+    behalf.  This is done by taking the 2nd forwardable
+    TGT and storing it in the GSS-API authenticator
+    "checksum".  This routine will populate
+    the krb5_data authenticator with this TGT.
+ Parameters:
+    krb5_context context: The kerberos context for this authentication.
+    krb5_auth_context:    The authentication context.
+    krb5_creds *credsp:   The ticket credentials (AS-REP).
+    krb5_ccache ccache:   The credentials cache.
+    krb5_data &authenticator: The checksum field that will store the TGT, and
+     authenticator.data must be freed by the caller.
+
+ Returns:
+    krb5_error_code: 0 if no errors, otherwise set.
+**************************************************************/
+
+static krb5_error_code ads_krb5_get_fwd_ticket( krb5_context context,
+                                        krb5_auth_context *auth_context,
+                                        krb5_creds *credsp,
+                                        krb5_ccache ccache,
+                                        krb5_data *authenticator)
+{
+       krb5_data fwdData;
+       krb5_error_code retval = 0;
+       char *pChksum = NULL;
+       char *p = NULL;
+
+       ZERO_STRUCT(fwdData);
+       ZERO_STRUCTP(authenticator);
+
+       retval = krb5_fwd_tgt_creds(context,/* Krb5 context [in] */
+                               *auth_context,  /* Authentication context [in] */
+                               CONST_DISCARD(char *, KRB5_TGS_NAME),  /* Ticket service name ("krbtgt") [in] */
+                               credsp->client, /* Client principal for the tgt [in] */
+                               credsp->server, /* Server principal for the tgt [in] */
+                               ccache,         /* Credential cache to use for storage [in] */
+                               1,              /* Turn on for "Forwardable ticket" [in] */
+                               &fwdData );     /* Resulting response [out] */
+
+
+       if (retval) {
+               DEBUG(1,("ads_krb5_get_fwd_ticket: krb5_fwd_tgt_creds failed (%s)\n", 
+                       error_message(retval)));
+               goto out;
+       }
+
+       if ((unsigned int)GSSAPI_CHECKSUM_SIZE + (unsigned int)fwdData.length <
+               (unsigned int)GSSAPI_CHECKSUM_SIZE) {
+               retval = EINVAL;
+               goto out;
+       }
+
+       /* We're going to allocate a gssChecksum structure with a little
+          extra data the length of the kerberos credentials length
+          (APPLICATION 22) so that we can pack it on the end of the structure.
+       */
+
+       pChksum = (char *)SMB_MALLOC(GSSAPI_CHECKSUM_SIZE + fwdData.length );
+       if (!pChksum) {
+               retval = ENOMEM;
+               goto out;
+       }
+
+       p = pChksum;
+
+       SIVAL(p, 0, GSSAPI_BNDLENGTH);
+       p += 4;
+
+       /* Zero out the bindings fields */
+       memset(p, '\0', GSSAPI_BNDLENGTH );
+       p += GSSAPI_BNDLENGTH;
+
+       SIVAL(p, 0, GSS_C_DELEG_FLAG );
+       p += 4;
+       SSVAL(p, 0, 1 );
+       p += 2;
+       SSVAL(p, 0, fwdData.length );
+       p += 2;
+
+       /* Migrate the kerberos KRB_CRED data to the checksum delegation */
+       memcpy(p, fwdData.data, fwdData.length );
+       p += fwdData.length;
+
+       /* We need to do this in order to allow our GSS-API  */
+       retval = krb5_auth_con_set_req_cksumtype( context, *auth_context, GSSAPI_CHECKSUM );
+       if (retval) {
+               goto out;
+       }
+
+       /* We now have a service ticket, now turn it into an AP-REQ. */
+       authenticator->length = fwdData.length + GSSAPI_CHECKSUM_SIZE;
+
+       /* Caller should call free() when they're done with this. */
+       authenticator->data = (char *)pChksum;
+
+  out:
+
+       /* Remove that input data, we never needed it anyway. */
+       if (fwdData.length > 0) {
+               krb5_free_data_contents( context, &fwdData );
+       }
+
+       return retval;
+}
+#endif
+
 #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, uint32 extra_ap_opts,
-                       const char *ccname) 
+                       const char *ccname, time_t *tgs_expire
 {
         DEBUG(0,("NO KERBEROS SUPPORT\n"));
         return 1;