r23586: Fix heimdal path in the krb5 renew routine when we need to compose the tgt
[sfrench/samba-autobuild/.git] / source / libsmb / clikrb5.c
index 67e9f539adf25f8ae9971671525305f1bb5fe9b1..0180bef47ae84fbf82fbddedaef17d420c6393d1 100644 (file)
 
 #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 */
                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;
 }
 #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_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;
@@ -301,7 +424,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 +446,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 +456,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 +490,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)
@@ -409,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
@@ -425,11 +577,11 @@ 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, ("ads_cleanup_expired_creds: 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, ("ads_cleanup_expired_creds: krb5_cc_remove_cred failed, err %s\n",
@@ -448,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;
@@ -456,8 +609,9 @@ 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,("ads_krb5_mk_req: Failed to parse principal %s\n", principal));
                return retval;
@@ -466,7 +620,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
        /* 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;
        }
@@ -479,7 +633,8 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
                goto cleanup_creds;
        }
 
-       while(!creds_ready) {
+       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",
@@ -495,15 +650,22 @@ 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) is valid until: (%s - %u)\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);
@@ -527,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, uint32 extra_ap_opts)
+                       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;
@@ -541,7 +706,7 @@ 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) {
@@ -554,7 +719,8 @@ 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))) {
+       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;
@@ -570,7 +736,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;
        }
 
@@ -604,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);
 
@@ -627,7 +794,7 @@ 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
@@ -744,6 +911,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 */
@@ -764,10 +932,10 @@ 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,
-                   krb5_keytab keytab,
                    krb5_const_principal server,
                    krb5_enctype enctype,
                    krb5_kvno kvno,
@@ -775,24 +943,30 @@ get_key_from_keytab(krb5_context context,
 {
        krb5_keytab_entry entry;
        krb5_error_code ret;
-       krb5_keytab real_keytab;
+       krb5_keytab keytab;
        char *name = NULL;
 
-       if (keytab == NULL) {
-               krb5_kt_default(context, &real_keytab);
-       } else {
-               real_keytab = keytab;
+       /* 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);
+       if (ret) {
+               DEBUG(0,("get_key_from_keytab: failed to open keytab: %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(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,
-                               real_keytab,
+                               keytab,
                                server,
                                kvno,
                                enctype,
@@ -819,38 +993,20 @@ get_key_from_keytab(krb5_context context,
        smb_krb5_kt_free_entry(context, &entry);
        
 out:    
-       if (keytab == NULL) {
-               krb5_kt_close(context, real_keytab);
-       }
-               
+       krb5_kt_close(context, keytab);
        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);
@@ -860,25 +1016,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,
@@ -891,7 +1035,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;
@@ -907,13 +1050,17 @@ 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, 
-                                 keytab,
                                  server,
                                  enctype,
                                  kvno,
@@ -924,10 +1071,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 {
@@ -942,7 +1085,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.
@@ -950,7 +1093,7 @@ 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, 
@@ -986,12 +1129,439 @@ out:
 #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;
+
+       initialize_krb5_error_table();
+       ret = krb5_init_context(&context);
+       if (ret) {
+               goto done;
+       }
+
+       if (!ccache_string) {
+               ccache_string = krb5_cc_default_name(context);
+       }
+
+       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;
+       }
+
+#ifdef HAVE_KRB5_GET_RENEWED_CREDS     /* MIT */
+       {
+               krb5_creds creds;
+       
+               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;
+                       }
+               }
+       
+               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;
+               }
+
+               /* 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;
+               }
+
+               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));
+
+               if (client_string) {
+                       ret = smb_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;
+                       }
+               }
+
+               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);
+               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 (expire_time) {
+                       *expire_time = (time_t) creds->times.endtime;
+               }
+                                               
+               krb5_free_cred_contents(context, &creds_in);
+               krb5_free_creds(context, creds);
+       }
+#else
+#error NO_SUITABKE_KRB5_TICKET_RENEW_FUNCTION_AVAILABLE
+#endif
+
+
+done:
+       if (client) {
+               krb5_free_principal(context, client);
+       }
+       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(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
 }
 
 #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) 
+                       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;