Merge branch 'v4-0-logon' of git://git.id10ts.net/samba into 4-0-local
[tprouty/samba.git] / source4 / heimdal / kdc / kerberos5.c
index ccfa35b6381e88e6f87ce05760ba9933ebfa18b5..f1dea6499df0252d71c15d4c64dcb27e7da02f65 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
 
 #include "kdc_locl.h"
 
-RCSID("$Id: kerberos5.c,v 1.177 2005/06/15 11:34:53 lha Exp $");
+RCSID("$Id: kerberos5.c 22071 2007-11-14 20:04:50Z lha $");
 
 #define MAX_TIME ((time_t)((1U << 31) - 1))
 
-static void
-fix_time(time_t **t)
+void
+_kdc_fix_time(time_t **t)
 {
     if(*t == NULL){
        ALLOC(*t);
@@ -65,14 +65,17 @@ set_salt_padata (METHOD_DATA *md, Salt *salt)
     if (salt) {
        realloc_method_data(md);
        md->val[md->len - 1].padata_type = salt->type;
-       copy_octet_string(&salt->salt,
-                         &md->val[md->len - 1].padata_value);
+       der_copy_octet_string(&salt->salt,
+                             &md->val[md->len - 1].padata_value);
     }
 }
 
-static PA_DATA*
-find_padata(KDC_REQ *req, int *start, int type)
+const PA_DATA*
+_kdc_find_padata(const KDC_REQ *req, int *start, int type)
 {
+    if (req->padata == NULL)
+       return NULL;
+
     while(*start < req->padata->len){
        (*start)++;
        if(req->padata->val[*start - 1].padata_type == type)
@@ -81,19 +84,38 @@ find_padata(KDC_REQ *req, int *start, int type)
     return NULL;
 }
 
+/*
+ * Detect if `key' is the using the the precomputed `default_salt'.
+ */
+
+static krb5_boolean
+is_default_salt_p(const krb5_salt *default_salt, const Key *key)
+{
+    if (key->salt == NULL)
+       return TRUE;
+    if (default_salt->salttype != key->salt->type)
+       return FALSE;
+    if (krb5_data_cmp(&default_salt->saltvalue, &key->salt->salt))
+       return FALSE;
+    return TRUE;
+}
+
 /*
  * return the first appropriate key of `princ' in `ret_key'.  Look for
  * all the etypes in (`etypes', `len'), stopping as soon as we find
  * one, but preferring one that has default salt
  */
 
-static krb5_error_code
-find_etype(krb5_context context, hdb_entry *princ, 
-          krb5_enctype *etypes, unsigned len, 
-          Key **ret_key, krb5_enctype *ret_etype)
+krb5_error_code
+_kdc_find_etype(krb5_context context, const hdb_entry_ex *princ,
+               krb5_enctype *etypes, unsigned len, 
+               Key **ret_key, krb5_enctype *ret_etype)
 {
     int i;
     krb5_error_code ret = KRB5KDC_ERR_ETYPE_NOSUPP;
+    krb5_salt def_salt;
+
+    krb5_get_pw_salt (context, princ->entry.principal, &def_salt);
 
     for(i = 0; ret != 0 && i < len ; i++) {
        Key *key = NULL;
@@ -101,7 +123,7 @@ find_etype(krb5_context context, hdb_entry *princ,
        if (krb5_enctype_valid(context, etypes[i]) != 0)
            continue;
 
-       while (hdb_next_enctype2key(context, princ, etypes[i], &key) == 0) {
+       while (hdb_next_enctype2key(context, &princ->entry, etypes[i], &key) == 0) {
            if (key->key.keyvalue.length == 0) {
                ret = KRB5KDC_ERR_NULL_KEY;
                continue;
@@ -109,61 +131,18 @@ find_etype(krb5_context context, hdb_entry *princ,
            *ret_key   = key;
            *ret_etype = etypes[i];
            ret = 0;
-           if (key->salt == NULL)
+           if (is_default_salt_p(&def_salt, key)) {
+               krb5_free_salt (context, def_salt);
                return ret;
+           }
        }
     }
+    krb5_free_salt (context, def_salt);
     return ret;
 }
 
-static krb5_error_code
-find_keys(krb5_context context, 
-         krb5_kdc_configuration *config,
-         hdb_entry *client,
-         hdb_entry *server, 
-         Key **ckey,
-         krb5_enctype *cetype,
-         Key **skey,
-         krb5_enctype *setype, 
-         krb5_enctype *etypes,
-         unsigned num_etypes)
-{
-    char unparse_name[] = "krb5_unparse_name failed";
-    krb5_error_code ret;
-    char *name;
-
-    if(client){
-       /* find client key */
-       ret = find_etype(context, client, etypes, num_etypes, ckey, cetype);
-       if (ret) {
-           if (krb5_unparse_name(context, client->principal, &name) != 0)
-               name = unparse_name;
-           kdc_log(context, config, 0, 
-                   "Client (%s) has no support for etypes", name);
-           if (name != unparse_name)
-               free(name);
-           return ret;
-       }
-    }
-
-    if(server){
-       /* find server key */
-       ret = find_etype(context, server, etypes, num_etypes, skey, setype);
-       if (ret) {
-           if (krb5_unparse_name(context, server->principal, &name) != 0)
-               name = unparse_name;
-           kdc_log(context, config, 0, 
-                   "Server (%s) has no support for etypes", name);
-           if (name != unparse_name)
-               free(name);
-           return ret;
-       }
-    }
-    return 0;
-}
-
-static krb5_error_code
-make_anonymous_principalname (PrincipalName *pn)
+krb5_error_code
+_kdc_make_anonymous_principalname (PrincipalName *pn)
 {
     pn->name_type = KRB5_NT_PRINCIPAL;
     pn->name_string.len = 1;
@@ -179,12 +158,12 @@ make_anonymous_principalname (PrincipalName *pn)
     return 0;
 }
 
-static void
-log_timestamp(krb5_context context, 
-             krb5_kdc_configuration *config,
-             const char *type,
-             KerberosTime authtime, KerberosTime *starttime, 
-             KerberosTime endtime, KerberosTime *renew_till)
+void
+_kdc_log_timestamp(krb5_context context, 
+                  krb5_kdc_configuration *config,
+                  const char *type,
+                  KerberosTime authtime, KerberosTime *starttime, 
+                  KerberosTime endtime, KerberosTime *renew_till)
 {
     char authtime_str[100], starttime_str[100], 
        endtime_str[100], renewtime_str[100];
@@ -209,15 +188,62 @@ log_timestamp(krb5_context context,
            type, authtime_str, starttime_str, endtime_str, renewtime_str);
 }
 
-static krb5_error_code
-encode_reply(krb5_context context,
-            krb5_kdc_configuration *config,
-            KDC_REP *rep, EncTicketPart *et, EncKDCRepPart *ek, 
-            krb5_enctype etype, 
-            int skvno, EncryptionKey *skey,
-            int ckvno, EncryptionKey *ckey,
-            const char **e_text,
-            krb5_data *reply)
+static void
+log_patypes(krb5_context context, 
+           krb5_kdc_configuration *config,
+           METHOD_DATA *padata)
+{
+    struct rk_strpool *p = NULL;
+    char *str;
+    int i;
+           
+    for (i = 0; i < padata->len; i++) {
+       switch(padata->val[i].padata_type) {
+       case KRB5_PADATA_PK_AS_REQ:
+           p = rk_strpoolprintf(p, "PK-INIT(ietf)");
+           break;
+       case KRB5_PADATA_PK_AS_REQ_WIN:
+           p = rk_strpoolprintf(p, "PK-INIT(win2k)");
+           break;
+       case KRB5_PADATA_PA_PK_OCSP_RESPONSE:
+           p = rk_strpoolprintf(p, "OCSP");
+           break;
+       case KRB5_PADATA_ENC_TIMESTAMP:
+           p = rk_strpoolprintf(p, "encrypted-timestamp");
+           break;
+       default:
+           p = rk_strpoolprintf(p, "%d", padata->val[i].padata_type);
+           break;
+       }
+       if (p && i + 1 < padata->len)
+           p = rk_strpoolprintf(p, ", ");
+       if (p == NULL) {
+           kdc_log(context, config, 0, "out of memory");
+           return;
+       }
+    }
+    if (p == NULL)
+       p = rk_strpoolprintf(p, "none");
+       
+    str = rk_strpoolcollect(p);
+    kdc_log(context, config, 0, "Client sent patypes: %s", str);
+    free(str);
+}
+
+/*
+ *
+ */
+
+
+krb5_error_code
+_kdc_encode_reply(krb5_context context,
+                 krb5_kdc_configuration *config,
+                 KDC_REP *rep, const EncTicketPart *et, EncKDCRepPart *ek, 
+                 krb5_enctype etype, 
+                 int skvno, const EncryptionKey *skey,
+                 int ckvno, const EncryptionKey *ckey,
+                 const char **e_text,
+                 krb5_data *reply)
 {
     unsigned char *buf;
     size_t buf_size;
@@ -321,6 +347,50 @@ encode_reply(krb5_context context,
     return 0;
 }
 
+/*
+ * Return 1 if the client have only older enctypes, this is for
+ * determining if the server should send ETYPE_INFO2 or not.
+ */
+
+static int
+older_enctype(krb5_enctype enctype)
+{
+    switch (enctype) {
+    case ETYPE_DES_CBC_CRC:
+    case ETYPE_DES_CBC_MD4:
+    case ETYPE_DES_CBC_MD5:
+    case ETYPE_DES3_CBC_SHA1:
+    case ETYPE_ARCFOUR_HMAC_MD5:
+    case ETYPE_ARCFOUR_HMAC_MD5_56:
+    /* 
+     * The following three is "old" windows enctypes and is needed for
+     * windows 2000 hosts.
+     */
+    case ETYPE_ARCFOUR_MD4:
+    case ETYPE_ARCFOUR_HMAC_OLD:
+    case ETYPE_ARCFOUR_HMAC_OLD_EXP:
+       return 1;
+    default:
+       return 0;
+    }
+}
+
+static int
+only_older_enctype_p(const KDC_REQ *req)
+{
+    int i;
+
+    for(i = 0; i < req->req_body.etype.len; i++) {
+       if (!older_enctype(req->req_body.etype.val[i]))
+           return 0;
+    }
+    return 1;
+}
+
+/*
+ *
+ */
+
 static krb5_error_code
 make_etype_info_entry(krb5_context context, ETYPE_INFO_ENTRY *ent, Key *key)
 {
@@ -348,8 +418,8 @@ make_etype_info_entry(krb5_context context, ETYPE_INFO_ENTRY *ent, Key *key)
        *ent->salttype = key->salt->type;
 #else
        /* 
-        * We shouldn't sent salttype since its incompatible with the
-        * specification and its break windows clients.  The afs
+        * We shouldn't sent salttype since it is incompatible with the
+        * specification and it breaks windows clients.  The afs
         * salting problem is solved by using KRB5-PADATA-AFS3-SALT
         * implemented in Heimdal 0.7 and later.
         */
@@ -391,31 +461,41 @@ get_pa_etype_info(krb5_context context,
        return ENOMEM;
     memset(pa.val, 0, pa.len * sizeof(*pa.val));
 
-    for(j = 0; j < etypes_len; j++) {
-       for (i = 0; i < n; i++)
-           if (pa.val[i].etype == etypes[j])
+    for(i = 0; i < client->keys.len; i++) {
+       for (j = 0; j < n; j++)
+           if (pa.val[j].etype == client->keys.val[i].key.keytype)
                goto skip1;
-       for(i = 0; i < client->keys.len; i++) {
+       for(j = 0; j < etypes_len; j++) {
            if(client->keys.val[i].key.keytype == etypes[j]) {
                if (krb5_enctype_valid(context, etypes[j]) != 0)
                    continue;
+               if (!older_enctype(etypes[j]))
+                   continue;
+               if (n >= pa.len)
+                   krb5_abortx(context, "internal error: n >= p.len");
                if((ret = make_etype_info_entry(context, 
                                                &pa.val[n++], 
                                                &client->keys.val[i])) != 0) {
                    free_ETYPE_INFO(&pa);
                    return ret;
                }
+               break;
            }
        }
     skip1:;
     }
     for(i = 0; i < client->keys.len; i++) {
+       /* already added? */
        for(j = 0; j < etypes_len; j++) {
            if(client->keys.val[i].key.keytype == etypes[j])
                goto skip2;
        }
        if (krb5_enctype_valid(context, client->keys.val[i].key.keytype) != 0)
            continue;
+       if (!older_enctype(etypes[j]))
+           continue;
+       if (n >= pa.len)
+           krb5_abortx(context, "internal error: n >= p.len");
        if((ret = make_etype_info_entry(context, 
                                        &pa.val[n++], 
                                        &client->keys.val[i])) != 0) {
@@ -425,15 +505,8 @@ get_pa_etype_info(krb5_context context,
     skip2:;
     }
     
-    if(n != pa.len) {
-       char *name;
-       ret = krb5_unparse_name(context, client->principal, &name);
-       if (ret)
-           name = "<unparse_name failed>";
-       kdc_log(context, config, 0, "internal error in get_pa_etype_info(%s): %d != %d", 
-               name, n, pa.len);
-       if (ret == 0)
-           free(name);
+    if(n < pa.len) {
+       /* stripped out dups, newer enctypes, and not valid enctypes */
        pa.len = n;
     }
 
@@ -523,33 +596,9 @@ make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
 }
 
 /*
- * Return 1 if the client have only older enctypes, this is for
- * determining if the server should send ETYPE_INFO2 or not.
- */
-
-static int
-only_older_enctype_p(const KDC_REQ *req)
-{
-    int i;
-
-    for(i = 0; i < req->req_body.etype.len; i++) {
-       switch (req->req_body.etype.val[i]) {
-       case ETYPE_DES_CBC_CRC:
-       case ETYPE_DES_CBC_MD4:
-       case ETYPE_DES_CBC_MD5:
-       case ETYPE_DES3_CBC_SHA1:
-       case ETYPE_ARCFOUR_HMAC_MD5:
-       case ETYPE_ARCFOUR_HMAC_MD5_56:
-           break;
-       default:
-           return 0;
-       }
-    }
-    return 1;
-}
-
-/*
- *
+ * Return an ETYPE-INFO2. Enctypes are storted the same way as in the
+ * database (client supported enctypes first, then the unsupported
+ * enctypes).
  */
 
 static krb5_error_code
@@ -573,30 +622,37 @@ get_pa_etype_info2(krb5_context context,
        return ENOMEM;
     memset(pa.val, 0, pa.len * sizeof(*pa.val));
 
-    for(j = 0; j < etypes_len; j++) {
-       for (i = 0; i < n; i++)
-           if (pa.val[i].etype == etypes[j])
+    for(i = 0; i < client->keys.len; i++) {
+       for (j = 0; j < n; j++)
+           if (pa.val[j].etype == client->keys.val[i].key.keytype)
                goto skip1;
-       for(i = 0; i < client->keys.len; i++) {
+       for(j = 0; j < etypes_len; j++) {
            if(client->keys.val[i].key.keytype == etypes[j]) {
                if (krb5_enctype_valid(context, etypes[j]) != 0)
                    continue;
+               if (n >= pa.len)
+                   krb5_abortx(context, "internal error: n >= p.len");
                if((ret = make_etype_info2_entry(&pa.val[n++], 
                                                 &client->keys.val[i])) != 0) {
                    free_ETYPE_INFO2(&pa);
                    return ret;
                }
+               break;
            }
        }
     skip1:;
     }
+    /* send enctypes that the client doesn't know about too */
     for(i = 0; i < client->keys.len; i++) {
+       /* already added? */
        for(j = 0; j < etypes_len; j++) {
            if(client->keys.val[i].key.keytype == etypes[j])
                goto skip2;
        }
        if (krb5_enctype_valid(context, client->keys.val[i].key.keytype) != 0)
            continue;
+       if (n >= pa.len)
+           krb5_abortx(context, "internal error: n >= p.len");
        if((ret = make_etype_info2_entry(&pa.val[n++],
                                         &client->keys.val[i])) != 0) {
            free_ETYPE_INFO2(&pa);
@@ -605,16 +661,8 @@ get_pa_etype_info2(krb5_context context,
       skip2:;
     }
     
-    if(n != pa.len) {
-       char *name;
-       ret = krb5_unparse_name(context, client->principal, &name);
-       if (ret)
-           name = "<unparse_name failed>";
-       kdc_log(context, config, 0,
-               "internal error in get_pa_etype_info2(%s): %d != %d", 
-               name, n, pa.len);
-       if (ret == 0)
-           free(name);
+    if(n < pa.len) {
+       /* stripped out dups, and not valid enctypes */
        pa.len = n;
     }
 
@@ -633,6 +681,69 @@ get_pa_etype_info2(krb5_context context,
     return 0;
 }
 
+/*
+ *
+ */
+
+static void
+log_as_req(krb5_context context,
+          krb5_kdc_configuration *config,
+          krb5_enctype cetype,
+          krb5_enctype setype,
+          const KDC_REQ_BODY *b)
+{
+    krb5_error_code ret;
+    struct rk_strpool *p = NULL;
+    char *str;
+    int i;
+    
+    for (i = 0; i < b->etype.len; i++) {
+       ret = krb5_enctype_to_string(context, b->etype.val[i], &str);
+       if (ret == 0) {
+           p = rk_strpoolprintf(p, "%s", str);
+           free(str);
+       } else
+           p = rk_strpoolprintf(p, "%d", b->etype.val[i]);
+       if (p && i + 1 < b->etype.len)
+           p = rk_strpoolprintf(p, ", ");
+       if (p == NULL) {
+           kdc_log(context, config, 0, "out of memory");
+           return;
+       }
+    }
+    if (p == NULL)
+       p = rk_strpoolprintf(p, "no encryption types");
+    
+    str = rk_strpoolcollect(p);
+    kdc_log(context, config, 0, "Client supported enctypes: %s", str);
+    free(str);
+
+    {
+       char *cet;
+       char *set;
+
+       ret = krb5_enctype_to_string(context, cetype, &cet);
+       if(ret == 0) {
+           ret = krb5_enctype_to_string(context, setype, &set);
+           if (ret == 0) {
+               kdc_log(context, config, 5, "Using %s/%s", cet, set);
+               free(set);
+           }
+           free(cet);
+       }
+       if (ret != 0)
+           kdc_log(context, config, 5, "Using e-types %d/%d", cetype, setype);
+    }
+    
+    {
+       char fixedstr[128];
+       unparse_flags(KDCOptions2int(b->kdc_options), asn1_KDCOptions_units(), 
+                     fixedstr, sizeof(fixedstr));
+       if(*fixedstr)
+           kdc_log(context, config, 2, "Requested flags: %s", fixedstr);
+    }
+}
+
 /*
  * verify the flags on `client' and `server', returning 0
  * if they are OK and generating an error messages and returning
@@ -642,11 +753,13 @@ get_pa_etype_info2(krb5_context context,
 krb5_error_code
 _kdc_check_flags(krb5_context context, 
                 krb5_kdc_configuration *config,
-                hdb_entry *client, const char *client_name,
-                hdb_entry *server, const char *server_name,
+                hdb_entry_ex *client_ex, const char *client_name,
+                hdb_entry_ex *server_ex, const char *server_name,
                 krb5_boolean is_as_req)
 {
-    if(client != NULL) {
+    if(client_ex != NULL) {
+       hdb_entry *client = &client_ex->entry;
+
        /* check client */
        if (client->flags.invalid) {
            kdc_log(context, config, 0, 
@@ -666,8 +779,7 @@ _kdc_check_flags(krb5_context context,
                             starttime_str, sizeof(starttime_str), TRUE); 
            kdc_log(context, config, 0,
                    "Client not yet valid until %s -- %s", 
-                   starttime_str, 
-                   client_name);
+                   starttime_str, client_name);
            return KRB5KDC_ERR_CLIENT_NOTYET;
        }
        
@@ -676,24 +788,28 @@ _kdc_check_flags(krb5_context context,
            krb5_format_time(context, *client->valid_end, 
                             endtime_str, sizeof(endtime_str), TRUE); 
            kdc_log(context, config, 0,
-                   "Client expired at %s -- %s", endtime_str, client_name);
+                   "Client expired at %s -- %s",
+                   endtime_str, client_name);
            return KRB5KDC_ERR_NAME_EXP;
        }
        
-       if (client->pw_end && *client->pw_end < kdc_time
-           && !server->flags.change_pw) {
+       if (client->pw_end && *client->pw_end < kdc_time 
+           && (server_ex == NULL || !server_ex->entry.flags.change_pw)) {
            char pwend_str[100];
            krb5_format_time(context, *client->pw_end, 
                             pwend_str, sizeof(pwend_str), TRUE); 
            kdc_log(context, config, 0,
-                   "Client's key has expired at %s -- %s", pwend_str, client_name);
+                   "Client's key has expired at %s -- %s", 
+                   pwend_str, client_name);
            return KRB5KDC_ERR_KEY_EXPIRED;
        }
     }
 
     /* check server */
     
-    if (server != NULL) {
+    if (server_ex != NULL) {
+       hdb_entry *server = &server_ex->entry;
+
        if (server->flags.invalid) {
            kdc_log(context, config, 0,
                    "Server has invalid flag set -- %s", server_name);
@@ -717,7 +833,8 @@ _kdc_check_flags(krb5_context context,
            krb5_format_time(context, *server->valid_start, 
                             starttime_str, sizeof(starttime_str), TRUE); 
            kdc_log(context, config, 0,
-                   "Server not yet valid until %s -- %s", server_name);
+                   "Server not yet valid until %s -- %s",
+                   starttime_str, server_name);
            return KRB5KDC_ERR_SERVICE_NOTYET;
        }
 
@@ -750,37 +867,38 @@ _kdc_check_flags(krb5_context context,
  * these checks
  */
 
-static krb5_boolean
-check_addresses(krb5_context context,        
-               krb5_kdc_configuration *config,
-               HostAddresses *addresses, const struct sockaddr *from)
+krb5_boolean
+_kdc_check_addresses(krb5_context context,        
+                    krb5_kdc_configuration *config,
+                    HostAddresses *addresses, const struct sockaddr *from)
 {
     krb5_error_code ret;
     krb5_address addr;
     krb5_boolean result;
     krb5_boolean only_netbios = TRUE;
     int i;
-
+    
     if(config->check_ticket_addresses == 0)
        return TRUE;
 
-    if(addresses == NULL) 
+    if(addresses == NULL)
        return config->allow_null_ticket_addresses;
-
+    
     for (i = 0; i < addresses->len; ++i) {
-           if (addresses->val[i].addr_type != KRB5_ADDRESS_NETBIOS) {
-                   only_netbios = FALSE;
-           }
+       if (addresses->val[i].addr_type != KRB5_ADDRESS_NETBIOS) {
+           only_netbios = FALSE;
+       }
     }
 
     /* Windows sends it's netbios name, which I can only assume is
-     * used for the 'allowed workstations' check.  This is painful, but
-     * we still want to check IP addresses if they happen to be
-     * present. */
+     * used for the 'allowed workstations' check.  This is painful,
+     * but we still want to check IP addresses if they happen to be
+     * present.
+     */
 
     if(only_netbios)
        return config->allow_null_ticket_addresses;
-    
+
     ret = krb5_sockaddr2address (context, from, &addr);
     if(ret)
        return FALSE;
@@ -790,6 +908,39 @@ check_addresses(krb5_context context,
     return result;
 }
 
+/*
+ *
+ */
+
+static krb5_boolean
+send_pac_p(krb5_context context, KDC_REQ *req)
+{
+    krb5_error_code ret;
+    PA_PAC_REQUEST pacreq;
+    const PA_DATA *pa;
+    int i = 0;
+    
+    pa = _kdc_find_padata(req, &i, KRB5_PADATA_PA_PAC_REQUEST);
+    if (pa == NULL)
+       return TRUE;
+
+    ret = decode_PA_PAC_REQUEST(pa->padata_value.data,
+                               pa->padata_value.length,
+                               &pacreq,
+                               NULL);
+    if (ret)
+       return TRUE;
+    i = pacreq.include_pac;
+    free_PA_PAC_REQUEST(&pacreq);
+    if (i == 0)
+       return FALSE;
+    return TRUE;
+}
+
+/*
+ *
+ */
+
 krb5_error_code
 _kdc_as_rep(krb5_context context, 
            krb5_kdc_configuration *config,
@@ -797,14 +948,15 @@ _kdc_as_rep(krb5_context context,
            const krb5_data *req_buffer, 
            krb5_data *reply,
            const char *from,
-           struct sockaddr *from_addr)
+           struct sockaddr *from_addr,
+           int datagram_reply)
 {
     KDC_REQ_BODY *b = &req->req_body;
     AS_REP rep;
     KDCOptions f = b->kdc_options;
-    hdb_entry_ex *client = NULL;
-    hdb_entry *server = NULL;
-    krb5_enctype cetype, setype;
+    hdb_entry_ex *client = NULL, *server = NULL;
+    krb5_enctype cetype, setype, sessionetype;
+    krb5_data e_data;
     EncTicketPart et;
     EncKDCRepPart ek;
     krb5_principal client_princ = NULL, server_princ = NULL;
@@ -814,22 +966,31 @@ _kdc_as_rep(krb5_context context,
     krb5_crypto crypto;
     Key *ckey, *skey;
     EncryptionKey *reply_key;
+    int flags = 0;
 #ifdef PKINIT
     pk_client_params *pkp = NULL;
 #endif
 
     memset(&rep, 0, sizeof(rep));
+    krb5_data_zero(&e_data);
+
+    if (f.canonicalize)
+       flags |= HDB_F_CANON;
 
     if(b->sname == NULL){
        ret = KRB5KRB_ERR_GENERIC;
        e_text = "No server in request";
     } else{
-       _krb5_principalname2krb5_principal (&server_princ,
-                                           *(b->sname), b->realm);
-       ret = krb5_unparse_name(context, server_princ, &server_name);
+       ret = _krb5_principalname2krb5_principal (context,
+                                                 &server_princ,
+                                                 *(b->sname),
+                                                 b->realm);
+       if (ret == 0)
+           ret = krb5_unparse_name(context, server_princ, &server_name);
     }
     if (ret) {
-       kdc_log(context, config, 0, "AS-REQ malformed server name from %s", from);
+       kdc_log(context, config, 0, 
+               "AS-REQ malformed server name from %s", from);
        goto out;
     }
     
@@ -837,19 +998,41 @@ _kdc_as_rep(krb5_context context,
        ret = KRB5KRB_ERR_GENERIC;
        e_text = "No client in request";
     } else {
-       _krb5_principalname2krb5_principal (&client_princ,
-                                           *(b->cname), b->realm);
+
+       if (b->cname->name_type == KRB5_NT_ENTERPRISE_PRINCIPAL) {
+           if (b->cname->name_string.len != 1) {
+               kdc_log(context, config, 0,
+                       "AS-REQ malformed canon request from %s, "
+                       "enterprise name with %d name components", 
+                       from, b->cname->name_string.len);
+               ret = KRB5_PARSE_MALFORMED;
+               goto out;
+           }
+           ret = krb5_parse_name(context, b->cname->name_string.val[0],
+                                 &client_princ);
+           if (ret)
+               goto out;
+       } else {
+           ret = _krb5_principalname2krb5_principal (context,
+                                                     &client_princ,
+                                                     *(b->cname),
+                                                     b->realm);
+           if (ret)
+               goto out;
+       }
        ret = krb5_unparse_name(context, client_princ, &client_name);
     }
     if (ret) {
-       kdc_log(context, config, 0, "AS-REQ malformed client name from %s", from);
+       kdc_log(context, config, 0,
+               "AS-REQ malformed client name from %s", from);
        goto out;
     }
 
     kdc_log(context, config, 0, "AS-REQ %s from %s for %s", 
            client_name, from, server_name);
 
-    ret = _kdc_db_fetch_ex(context, config, client_princ, HDB_ENT_TYPE_CLIENT, &client);
+    ret = _kdc_db_fetch(context, config, client_princ, 
+                       HDB_F_GET_CLIENT | flags, NULL, &client);
     if(ret){
        kdc_log(context, config, 0, "UNKNOWN -- %s: %s", client_name,
                krb5_get_err_text(context, ret));
@@ -857,7 +1040,9 @@ _kdc_as_rep(krb5_context context,
        goto out;
     }
 
-    ret = _kdc_db_fetch(context, config, server_princ, HDB_ENT_TYPE_SERVER, &server);
+    ret = _kdc_db_fetch(context, config, server_princ,
+                       HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
+                       NULL, &server);
     if(ret){
        kdc_log(context, config, 0, "UNKNOWN -- %s: %s", server_name,
                krb5_get_err_text(context, ret));
@@ -865,28 +1050,27 @@ _kdc_as_rep(krb5_context context,
        goto out;
     }
 
+    ret = _kdc_windc_client_access(context, client, req, &e_data);
+    if(ret)
+       goto out;
+
     ret = _kdc_check_flags(context, config, 
-                          &client->entry, client_name,
+                          client, client_name,
                           server, server_name,
                           TRUE);
     if(ret)
        goto out;
 
-    if (client->check_client_access) {
-       ret = client->check_client_access(context, client, 
-                                         b->addresses);
-       if(ret)
-           goto out;
-    }
-
     memset(&et, 0, sizeof(et));
     memset(&ek, 0, sizeof(ek));
 
     if(req->padata){
-       int i = 0;
-       PA_DATA *pa;
+       int i;
+       const PA_DATA *pa;
        int found_pa = 0;
 
+       log_patypes(context, config, req->padata);
+
 #ifdef PKINIT
        kdc_log(context, config, 5, 
                "Looking for PKINIT pa-data -- %s", client_name);
@@ -894,11 +1078,11 @@ _kdc_as_rep(krb5_context context,
        e_text = "No PKINIT PA found";
 
        i = 0;
-       if ((pa = find_padata(req, &i, KRB5_PADATA_PK_AS_REQ)))
+       if ((pa = _kdc_find_padata(req, &i, KRB5_PADATA_PK_AS_REQ)))
            ;
        if (pa == NULL) {
            i = 0;
-           if((pa = find_padata(req, &i, KRB5_PADATA_PK_AS_REQ_WIN)))
+           if((pa = _kdc_find_padata(req, &i, KRB5_PADATA_PK_AS_REQ_WIN)))
                ;
        }
        if (pa) {
@@ -917,8 +1101,7 @@ _kdc_as_rep(krb5_context context,
 
            ret = _kdc_pk_check_client(context,
                                       config,
-                                      client_princ, 
-                                      &client->entry,
+                                      client,
                                       pkp,
                                       &client_cert);
            if (ret) {
@@ -928,7 +1111,7 @@ _kdc_as_rep(krb5_context context,
 
                kdc_log(context, config, 0, "%s", e_text);
                pkp = NULL;
-               goto ts_enc;
+               goto out;
            }
            found_pa = 1;
            et.flags.pre_authent = 1;
@@ -946,7 +1129,7 @@ _kdc_as_rep(krb5_context context,
 
        i = 0;
        e_text = "No ENC-TS found";
-       while((pa = find_padata(req, &i, KRB5_PADATA_ENC_TIMESTAMP))){
+       while((pa = _kdc_find_padata(req, &i, KRB5_PADATA_ENC_TIMESTAMP))){
            krb5_data ts_data;
            PA_ENC_TS_ENC p;
            size_t len;
@@ -967,11 +1150,12 @@ _kdc_as_rep(krb5_context context,
                goto out;
            }
            
-           ret = hdb_enctype2key(context, &client->entry, enc_data.etype, &pa_key);
+           ret = hdb_enctype2key(context, &client->entry, 
+                                 enc_data.etype, &pa_key);
            if(ret){
                char *estr;
                e_text = "No key matches pa-data";
-               ret = KRB5KDC_ERR_PREAUTH_FAILED;
+               ret = KRB5KDC_ERR_ETYPE_NOSUPP;
                if(krb5_enctype_to_string(context, enc_data.etype, &estr))
                    estr = NULL;
                if(estr == NULL)
@@ -1006,7 +1190,7 @@ _kdc_as_rep(krb5_context context,
            if(ret){
                krb5_error_code ret2;
                ret2 = krb5_enctype_to_string(context, 
-                                            pa_key->key.keytype, &str);
+                                             pa_key->key.keytype, &str);
                if (ret2)
                    str = NULL;
                kdc_log(context, config, 5, 
@@ -1023,7 +1207,7 @@ _kdc_as_rep(krb5_context context,
                e_text = "Failed to decrypt PA-DATA";
 
                free_EncryptedData(&enc_data);
-               ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
+               ret = KRB5KDC_ERR_PREAUTH_FAILED;
                continue;
            }
            free_EncryptedData(&enc_data);
@@ -1034,7 +1218,7 @@ _kdc_as_rep(krb5_context context,
            krb5_data_free(&ts_data);
            if(ret){
                e_text = "Failed to decode PA-ENC-TS-ENC";
-               ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
+               ret = KRB5KDC_ERR_PREAUTH_FAILED;
                kdc_log(context, config, 
                        5, "Failed to decode PA-ENC-TS_ENC -- %s",
                        client_name);
@@ -1042,10 +1226,32 @@ _kdc_as_rep(krb5_context context,
            }
            free_PA_ENC_TS_ENC(&p);
            if (abs(kdc_time - p.patimestamp) > context->max_skew) {
-               ret = KRB5KRB_AP_ERR_SKEW;
+               char client_time[100];
+               
+               krb5_format_time(context, p.patimestamp, 
+                                client_time, sizeof(client_time), TRUE); 
+
+               ret = KRB5KRB_AP_ERR_SKEW;
+               kdc_log(context, config, 0,
+                       "Too large time skew, "
+                       "client time %s is out by %u > %u seconds -- %s", 
+                       client_time, 
+                       (unsigned)abs(kdc_time - p.patimestamp), 
+                       context->max_skew,
+                       client_name);
+#if 1
+               /* This code is from samba, needs testing */
+               /* 
+                * the following is needed to make windows clients
+                * to retry using the timestamp in the error message
+                *
+                * this is maybe a bug in windows to not trying when e_text
+                * is present...
+                */
+               e_text = NULL;
+#else
                e_text = "Too large time skew";
-               kdc_log(context, config, 0,
-                       "Too large time skew -- %s", client_name);
+#endif
                goto out;
            }
            et.flags.pre_authent = 1;
@@ -1074,12 +1280,11 @@ _kdc_as_rep(krb5_context context,
        }
     }else if (config->require_preauth
              || client->entry.flags.require_preauth
-             || server->flags.require_preauth) {
+             || server->entry.flags.require_preauth) {
        METHOD_DATA method_data;
        PA_DATA *pa;
        unsigned char *buf;
        size_t len;
-       krb5_data foo_data;
 
     use_pa: 
        method_data.len = 0;
@@ -1097,96 +1302,124 @@ _kdc_as_rep(krb5_context context,
        pa->padata_type         = KRB5_PADATA_PK_AS_REQ;
        pa->padata_value.length = 0;
        pa->padata_value.data   = NULL;
+
+       ret = realloc_method_data(&method_data);
+       pa = &method_data.val[method_data.len-1];
+       pa->padata_type         = KRB5_PADATA_PK_AS_REQ_WIN;
+       pa->padata_value.length = 0;
+       pa->padata_value.data   = NULL;
 #endif
 
+       /* 
+        * RFC4120 requires: 
+        * - If the client only knows about old enctypes, then send
+        *   both info replies (we send 'info' first in the list).
+        * - If the client is 'modern', because it knows about 'new'
+        *   enctype types, then only send the 'info2' reply.
+        */
+
        /* XXX check ret */
        if (only_older_enctype_p(req))
-           ret = get_pa_etype_info(context, config, &method_data, &client->entry, 
+           ret = get_pa_etype_info(context, config,
+                                   &method_data, &client->entry, 
                                    b->etype.val, b->etype.len); 
        /* XXX check ret */
-       ret = get_pa_etype_info2(context, config, &method_data, &client->entry, 
-                                b->etype.val, b->etype.len);
+       ret = get_pa_etype_info2(context, config, &method_data, 
+                                &client->entry, b->etype.val, b->etype.len);
 
        
        ASN1_MALLOC_ENCODE(METHOD_DATA, buf, len, &method_data, &len, ret);
        free_METHOD_DATA(&method_data);
-       foo_data.data   = buf;
-       foo_data.length = len;
-       
+
+       e_data.data   = buf;
+       e_data.length = len;
+       e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ",
+
        ret = KRB5KDC_ERR_PREAUTH_REQUIRED;
-       krb5_mk_error(context,
-                     ret,
-                     "Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ",
-                     &foo_data,
-                     client_princ,
-                     server_princ,
-                     NULL,
-                     NULL,
-                     reply);
-       free(buf);
+
        kdc_log(context, config, 0,
                "No preauth found, returning PREAUTH-REQUIRED -- %s",
                client_name);
-       ret = 0;
-       goto out2;
-    }
-    
-    ret = find_keys(context, config, 
-                   &client->entry, server, &ckey, &cetype, &skey, &setype,
-                   b->etype.val, b->etype.len);
-    if(ret) {
-       kdc_log(context, config, 0, "Server/client has no support for etypes");
        goto out;
     }
-       
-    {
-       struct rk_strpool *p = NULL;
-       char *str;
-       int i;
+    
+    /*
+     * Find the client key (for preauth ENC-TS verification and reply
+     * encryption).  Then the best encryption type for the KDC and
+     * last the best session key that shared between the client and
+     * KDC runtime enctypes.
+     */
 
-       for (i = 0; i < b->etype.len; i++) {
-           ret = krb5_enctype_to_string(context, b->etype.val[i], &str);
-           if (ret == 0) {
-               p = rk_strpoolprintf(p, "%s", str);
-               free(str);
-           } else
-               p = rk_strpoolprintf(p, "%d", b->etype.val[i]);
-           if (p && i + 1 < b->etype.len)
-               p = rk_strpoolprintf(p, ", ");
-           if (p == NULL) {
-               kdc_log(context, config, 0, "out of meory");
-               goto out;
-           }
-       }
-       str = rk_strpoolcollect(p);
-       kdc_log(context, config, 0, "Client supported enctypes: %s", str);
-       free(str);
+    ret = _kdc_find_etype(context, client, b->etype.val, b->etype.len,
+                         &ckey, &cetype);
+    if (ret) {
+       kdc_log(context, config, 0, 
+               "Client (%s) has no support for etypes", client_name);
+       goto out;
     }
+       
+    ret = _kdc_get_preferred_key(context, config,
+                                server, server_name,
+                                &setype, &skey);
+    if(ret)
+       goto out;
+
+    /* 
+     * Select a session enctype from the list of the crypto systems
+     * supported enctype, is supported by the client and is one of the
+     * enctype of the enctype of the krbtgt.
+     *
+     * The later is used as a hint what enctype all KDC are supporting
+     * to make sure a newer version of KDC wont generate a session
+     * enctype that and older version of a KDC in the same realm can't
+     * decrypt.
+     *
+     * But if the KDC admin is paranoid and doesn't want to have "no
+     * the best" enctypes on the krbtgt, lets save the best pick from
+     * the client list and hope that that will work for any other
+     * KDCs.
+     */
     {
-       char *cet;
-       char *set;
+       const krb5_enctype *p;
+       krb5_enctype clientbest = ETYPE_NULL;
+       int i, j;
 
-       ret = krb5_enctype_to_string(context, cetype, &cet);
-       if(ret == 0) {
-           ret = krb5_enctype_to_string(context, setype, &set);
-           if (ret == 0) {
-               kdc_log(context, config, 5, "Using %s/%s", cet, set);
-               free(set);
+       p = krb5_kerberos_enctypes(context);
+
+       sessionetype = ETYPE_NULL;
+
+       for (i = 0; p[i] != ETYPE_NULL && sessionetype == ETYPE_NULL; i++) {
+           if (krb5_enctype_valid(context, p[i]) != 0)
+               continue;
+
+           for (j = 0; j < b->etype.len && sessionetype == ETYPE_NULL; j++) {
+               Key *dummy;
+               /* check with client */
+               if (p[i] != b->etype.val[j])
+                   continue; 
+               /* save best of union of { client, crypto system } */
+               if (clientbest == ETYPE_NULL)
+                   clientbest = p[i];
+               /* check with krbtgt */
+               ret = hdb_enctype2key(context, &server->entry, p[i], &dummy);
+               if (ret) 
+                   continue;
+               sessionetype = p[i];
            }
-           free(cet);
        }
-       if (ret != 0)
-           kdc_log(context, config, 5, "Using e-types %d/%d", cetype, setype);
-    }
-    
-    {
-       char str[128];
-       unparse_flags(KDCOptions2int(f), asn1_KDCOptions_units()
-                     str, sizeof(str));
-       if(*str)
-           kdc_log(context, config, 2, "Requested flags: %s", str);
+       /* if krbtgt had no shared keys with client, pick clients best */
+       if (clientbest != ETYPE_NULL && sessionetype == ETYPE_NULL) {
+           sessionetype = clientbest;
+       } else if (sessionetype == ETYPE_NULL) {
+           kdc_log(context, config, 0,
+                   "Client (%s) from %s has no common enctypes with KDC"
+                   "to use for the session key"
+                   client_name, from); 
+           goto out;
+       }
     }
-    
+
+    log_as_req(context, config, cetype, setype, b);
 
     if(f.renew || f.validate || f.proxy || f.forwarded || f.enc_tkt_in_skey
        || (f.request_anonymous && !config->allow_anonymous)) {
@@ -1199,17 +1432,23 @@ _kdc_as_rep(krb5_context context,
     rep.msg_type = krb_as_rep;
     copy_Realm(&client->entry.principal->realm, &rep.crealm);
     if (f.request_anonymous)
-       make_anonymous_principalname (&rep.cname);
+       _kdc_make_anonymous_principalname (&rep.cname);
     else
        _krb5_principal2principalname(&rep.cname, 
                                      client->entry.principal);
     rep.ticket.tkt_vno = 5;
-    copy_Realm(&server->principal->realm, &rep.ticket.realm);
+    copy_Realm(&server->entry.principal->realm, &rep.ticket.realm);
     _krb5_principal2principalname(&rep.ticket.sname, 
-                                 server->principal);
+                                 server->entry.principal);
+    /* java 1.6 expects the name to be the same type, lets allow that
+     * uncomplicated name-types. */
+#define CNT(sp,t) (((sp)->sname->name_type) == KRB5_NT_##t)
+    if (CNT(b, UNKNOWN) || CNT(b, PRINCIPAL) || CNT(b, SRV_INST) || CNT(b, SRV_HST) || CNT(b, SRV_XHST))
+       rep.ticket.sname.name_type = b->sname->name_type;
+#undef CNT
 
     et.flags.initial = 1;
-    if(client->entry.flags.forwardable && server->flags.forwardable)
+    if(client->entry.flags.forwardable && server->entry.flags.forwardable)
        et.flags.forwardable = f.forwardable;
     else if (f.forwardable) {
        ret = KRB5KDC_ERR_POLICY;
@@ -1217,7 +1456,7 @@ _kdc_as_rep(krb5_context context,
                "Ticket may not be forwardable -- %s", client_name);
        goto out;
     }
-    if(client->entry.flags.proxiable && server->flags.proxiable)
+    if(client->entry.flags.proxiable && server->entry.flags.proxiable)
        et.flags.proxiable = f.proxiable;
     else if (f.proxiable) {
        ret = KRB5KDC_ERR_POLICY;
@@ -1225,7 +1464,7 @@ _kdc_as_rep(krb5_context context,
                "Ticket may not be proxiable -- %s", client_name);
        goto out;
     }
-    if(client->entry.flags.postdate && server->flags.postdate)
+    if(client->entry.flags.postdate && server->entry.flags.postdate)
        et.flags.may_postdate = f.allow_postdate;
     else if (f.allow_postdate){
        ret = KRB5KDC_ERR_POLICY;
@@ -1235,14 +1474,16 @@ _kdc_as_rep(krb5_context context,
     }
 
     /* check for valid set of addresses */
-    if(!check_addresses(context, config, b->addresses, from_addr)) {
+    if(!_kdc_check_addresses(context, config, b->addresses, from_addr)) {
        ret = KRB5KRB_AP_ERR_BADADDR;
        kdc_log(context, config, 0,
                "Bad address list requested -- %s", client_name);
        goto out;
     }
 
-    krb5_generate_random_keyblock(context, setype, &et.key);
+    ret = krb5_generate_random_keyblock(context, sessionetype, &et.key);
+    if (ret)
+       goto out;
     copy_PrincipalName(&rep.cname, &et.cname);
     copy_Realm(&rep.crealm, &et.crealm);
     
@@ -1258,15 +1499,15 @@ _kdc_as_rep(krb5_context context,
            et.flags.invalid = 1;
            et.flags.postdated = 1; /* XXX ??? */
        }
-       fix_time(&b->till);
+       _kdc_fix_time(&b->till);
        t = *b->till;
 
        /* be careful not overflowing */
 
        if(client->entry.max_life)
            t = start + min(t - start, *client->entry.max_life);
-       if(server->max_life)
-           t = start + min(t - start, *server->max_life);
+       if(server->entry.max_life)
+           t = start + min(t - start, *server->entry.max_life);
 #if 0
        t = min(t, start + realm->max_life);
 #endif
@@ -1286,8 +1527,8 @@ _kdc_as_rep(krb5_context context,
                t = MAX_TIME;
            if(client->entry.max_renew)
                t = start + min(t - start, *client->entry.max_renew);
-           if(server->max_renew)
-               t = start + min(t - start, *server->max_renew);
+           if(server->entry.max_renew)
+               t = start + min(t - start, *server->entry.max_renew);
 #if 0
            t = min(t, start + realm->max_renew);
 #endif
@@ -1320,10 +1561,14 @@ _kdc_as_rep(krb5_context context,
      * otherwise just a dummy lr.
      */
     ek.last_req.val = malloc(2 * sizeof(*ek.last_req.val));
+    if (ek.last_req.val == NULL) {
+       ret = ENOMEM;
+       goto out;
+    }
     ek.last_req.len = 0;
     if (client->entry.pw_end
        && (config->kdc_warn_pwexpire == 0
-           || kdc_time + config->kdc_warn_pwexpire <= *client->entry.pw_end)) {
+           || kdc_time + config->kdc_warn_pwexpire >= *client->entry.pw_end)) {
        ek.last_req.val[ek.last_req.len].lr_type  = LR_PW_EXPTIME;
        ek.last_req.val[ek.last_req.len].lr_value = *client->entry.pw_end;
        ++ek.last_req.len;
@@ -1343,7 +1588,8 @@ _kdc_as_rep(krb5_context context,
        ALLOC(ek.key_expiration);
        if (client->entry.valid_end) {
            if (client->entry.pw_end)
-               *ek.key_expiration = min(*client->entry.valid_end, *client->entry.pw_end);
+               *ek.key_expiration = min(*client->entry.valid_end, 
+                                        *client->entry.pw_end);
            else
                *ek.key_expiration = *client->entry.valid_end;
        } else
@@ -1380,43 +1626,144 @@ _kdc_as_rep(krb5_context context,
                                  &reply_key, rep.padata);
        if (ret)
            goto out;
+       ret = _kdc_add_inital_verified_cas(context,
+                                          config,
+                                          pkp,
+                                          &et);
+       if (ret)
+           goto out;
     }
 #endif
 
     set_salt_padata (rep.padata, ckey->salt);
 
+    /* Add signing of alias referral */
+    if (f.canonicalize) {
+       PA_ClientCanonicalized canon;
+       krb5_data data;
+       PA_DATA pa;
+       krb5_crypto crypto;
+       size_t len;
+
+       memset(&canon, 0, sizeof(canon));
+
+       canon.names.requested_name = *b->cname;
+       canon.names.real_name = client->entry.principal->name;
+
+       ASN1_MALLOC_ENCODE(PA_ClientCanonicalizedNames, data.data, data.length,
+                          &canon.names, &len, ret);
+       if (ret) 
+           goto out;
+       if (data.length != len)
+           krb5_abortx(context, "internal asn.1 error");
+
+       /* sign using "returned session key" */
+       ret = krb5_crypto_init(context, &et.key, 0, &crypto);
+       if (ret) {
+           free(data.data);
+           goto out;
+       }
+
+       ret = krb5_create_checksum(context, crypto, 
+                                  KRB5_KU_CANONICALIZED_NAMES, 0,
+                                  data.data, data.length,
+                                  &canon.canon_checksum);
+       free(data.data);
+       krb5_crypto_destroy(context, crypto);
+       if (ret)
+           goto out;
+         
+       ASN1_MALLOC_ENCODE(PA_ClientCanonicalized, data.data, data.length,
+                          &canon, &len, ret);
+       free_Checksum(&canon.canon_checksum);
+       if (ret) 
+           goto out;
+       if (data.length != len)
+           krb5_abortx(context, "internal asn.1 error");
+
+       pa.padata_type = KRB5_PADATA_CLIENT_CANONICALIZED;
+       pa.padata_value = data;
+       ret = add_METHOD_DATA(rep.padata, &pa);
+       free(data.data);
+       if (ret)
+           goto out;
+    }
+
     if (rep.padata->len == 0) {
        free(rep.padata);
        rep.padata = NULL;
     }
 
-    /* Add the PAC, via a HDB abstraction */
-    if (client->authz_data_as_req) {
-           ret = client->authz_data_as_req(context, client, 
-                                           req->padata, 
-                                           et.authtime,
-                                           &skey->key,
-                                           &et.key,
-                                           &et.authorization_data);
-           if (ret) 
-                   goto out;
+    /* Add the PAC */
+    if (send_pac_p(context, req)) {
+       krb5_pac p = NULL;
+       krb5_data data;
+
+       ret = _kdc_pac_generate(context, client, &p);
+       if (ret) {
+           kdc_log(context, config, 0, "PAC generation failed for -- %s", 
+                   client_name);
+           goto out;
+       }
+       if (p != NULL) {
+           ret = _krb5_pac_sign(context, p, et.authtime,
+                                client->entry.principal,
+                                &skey->key, /* Server key */ 
+                                &skey->key, /* FIXME: should be krbtgt key */
+                                &data);
+           krb5_pac_free(context, p);
+           if (ret) {
+               kdc_log(context, config, 0, "PAC signing failed for -- %s", 
+                       client_name);
+               goto out;
+           }
+
+           ret = _kdc_tkt_add_if_relevant_ad(context, &et,
+                                             KRB5_AUTHDATA_WIN2K_PAC,
+                                             &data);
+           krb5_data_free(&data);
+           if (ret)
+               goto out;
+       }
     }
 
-    log_timestamp(context, config, "AS-REQ", et.authtime, et.starttime, 
-                 et.endtime, et.renew_till);
+    _kdc_log_timestamp(context, config, "AS-REQ", et.authtime, et.starttime, 
+                      et.endtime, et.renew_till);
 
-    ret = encode_reply(context, config, 
-                      &rep, &et, &ek, setype, server->kvno, &skey->key,
-                      client->entry.kvno, reply_key, &e_text, reply);
+    /* do this as the last thing since this signs the EncTicketPart */
+    ret = _kdc_add_KRB5SignedPath(context,
+                                 config,
+                                 server,
+                                 setype,
+                                 NULL,
+                                 NULL,
+                                 &et);
+    if (ret)
+       goto out;
+
+    ret = _kdc_encode_reply(context, config, 
+                           &rep, &et, &ek, setype, server->entry.kvno, 
+                           &skey->key, client->entry.kvno, 
+                           reply_key, &e_text, reply);
     free_EncTicketPart(&et);
     free_EncKDCRepPart(&ek);
- out:
+    if (ret)
+       goto out;
+
+    /* */
+    if (datagram_reply && reply->length > config->max_datagram_reply_length) {
+       krb5_data_free(reply);
+       ret = KRB5KRB_ERR_RESPONSE_TOO_BIG;
+       e_text = "Reply packet too large";
+    }
+
+out:
     free_AS_REP(&rep);
     if(ret){
        krb5_mk_error(context,
                      ret,
                      e_text,
-                     NULL,
+                     (e_data.data ? &e_data : NULL),
                      client_princ,
                      server_princ,
                      NULL,
@@ -1424,11 +1771,12 @@ _kdc_as_rep(krb5_context context,
                      reply);
        ret = 0;
     }
- out2:
 #ifdef PKINIT
     if (pkp)
        _kdc_pk_free_client_param(context, pkp);
 #endif
+    if (e_data.data)
+        free(e_data.data);
     if (client_princ)
        krb5_free_principal(context, client_princ);
     free(client_name);
@@ -1436,1086 +1784,69 @@ _kdc_as_rep(krb5_context context,
        krb5_free_principal(context, server_princ);
     free(server_name);
     if(client)
-       _kdc_free_ent_ex(context, client);
+       _kdc_free_ent(context, client);
     if(server)
        _kdc_free_ent(context, server);
     return ret;
 }
 
-
-static krb5_error_code
-check_tgs_flags(krb5_context context,        
-               krb5_kdc_configuration *config,
-               KDC_REQ_BODY *b, EncTicketPart *tgt, EncTicketPart *et)
-{
-    KDCOptions f = b->kdc_options;
-       
-    if(f.validate){
-       if(!tgt->flags.invalid || tgt->starttime == NULL){
-           kdc_log(context, config, 0,
-                   "Bad request to validate ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       if(*tgt->starttime > kdc_time){
-           kdc_log(context, config, 0,
-                   "Early request to validate ticket");
-           return KRB5KRB_AP_ERR_TKT_NYV;
-       }
-       /* XXX  tkt = tgt */
-       et->flags.invalid = 0;
-    }else if(tgt->flags.invalid){
-       kdc_log(context, config, 0, 
-               "Ticket-granting ticket has INVALID flag set");
-       return KRB5KRB_AP_ERR_TKT_INVALID;
-    }
-
-    if(f.forwardable){
-       if(!tgt->flags.forwardable){
-           kdc_log(context, config, 0,
-                   "Bad request for forwardable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.forwardable = 1;
-    }
-    if(f.forwarded){
-       if(!tgt->flags.forwardable){
-           kdc_log(context, config, 0,
-                   "Request to forward non-forwardable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.forwarded = 1;
-       et->caddr = b->addresses;
-    }
-    if(tgt->flags.forwarded)
-       et->flags.forwarded = 1;
-       
-    if(f.proxiable){
-       if(!tgt->flags.proxiable){
-           kdc_log(context, config, 0,
-                   "Bad request for proxiable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.proxiable = 1;
-    }
-    if(f.proxy){
-       if(!tgt->flags.proxiable){
-           kdc_log(context, config, 0,
-                   "Request to proxy non-proxiable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.proxy = 1;
-       et->caddr = b->addresses;
-    }
-    if(tgt->flags.proxy)
-       et->flags.proxy = 1;
-
-    if(f.allow_postdate){
-       if(!tgt->flags.may_postdate){
-           kdc_log(context, config, 0,
-                   "Bad request for post-datable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.may_postdate = 1;
-    }
-    if(f.postdated){
-       if(!tgt->flags.may_postdate){
-           kdc_log(context, config, 0,
-                   "Bad request for postdated ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       if(b->from)
-           *et->starttime = *b->from;
-       et->flags.postdated = 1;
-       et->flags.invalid = 1;
-    }else if(b->from && *b->from > kdc_time + context->max_skew){
-       kdc_log(context, config, 0, "Ticket cannot be postdated");
-       return KRB5KDC_ERR_CANNOT_POSTDATE;
-    }
-
-    if(f.renewable){
-       if(!tgt->flags.renewable){
-           kdc_log(context, config, 0,
-                   "Bad request for renewable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       et->flags.renewable = 1;
-       ALLOC(et->renew_till);
-       fix_time(&b->rtime);
-       *et->renew_till = *b->rtime;
-    }
-    if(f.renew){
-       time_t old_life;
-       if(!tgt->flags.renewable || tgt->renew_till == NULL){
-           kdc_log(context, config, 0,
-                   "Request to renew non-renewable ticket");
-           return KRB5KDC_ERR_BADOPTION;
-       }
-       old_life = tgt->endtime;
-       if(tgt->starttime)
-           old_life -= *tgt->starttime;
-       else
-           old_life -= tgt->authtime;
-       et->endtime = *et->starttime + old_life;
-       if (et->renew_till != NULL)
-           et->endtime = min(*et->renew_till, et->endtime);
-    }      
-    
-    /* checks for excess flags */
-    if(f.request_anonymous && !config->allow_anonymous){
-       kdc_log(context, config, 0,
-               "Request for anonymous ticket");
-       return KRB5KDC_ERR_BADOPTION;
-    }
-    return 0;
-}
-
-static krb5_error_code
-fix_transited_encoding(krb5_context context, 
-                      krb5_kdc_configuration *config,
-                      krb5_boolean check_policy,
-                      TransitedEncoding *tr, 
-                      EncTicketPart *et, 
-                      const char *client_realm, 
-                      const char *server_realm, 
-                      const char *tgt_realm)
-{
-    krb5_error_code ret = 0;
-    char **realms, **tmp;
-    int num_realms;
-    int i;
-
-    switch (tr->tr_type) {
-    case DOMAIN_X500_COMPRESS:
-       break;
-    case 0:
-       /*
-        * Allow empty content of type 0 because that is was Microsoft
-        * generates in their TGT.
-        */
-       if (tr->contents.length == 0)
-           break;
-       kdc_log(context, config, 0,
-               "Transited type 0 with non empty content");
-       return KRB5KDC_ERR_TRTYPE_NOSUPP;
-    default:
-       kdc_log(context, config, 0,
-               "Unknown transited type: %u", tr->tr_type);
-       return KRB5KDC_ERR_TRTYPE_NOSUPP;
-    }
-
-    ret = krb5_domain_x500_decode(context, 
-                                 tr->contents,
-                                 &realms, 
-                                 &num_realms,
-                                 client_realm,
-                                 server_realm);
-    if(ret){
-       krb5_warn(context, ret,
-                 "Decoding transited encoding");
-       return ret;
-    }
-    if(strcmp(client_realm, tgt_realm) && strcmp(server_realm, tgt_realm)) {
-       /* not us, so add the previous realm to transited set */
-       if (num_realms < 0 || num_realms + 1 > UINT_MAX/sizeof(*realms)) {
-           ret = ERANGE;
-           goto free_realms;
-       }
-       tmp = realloc(realms, (num_realms + 1) * sizeof(*realms));
-       if(tmp == NULL){
-           ret = ENOMEM;
-           goto free_realms;
-       }
-       realms = tmp;
-       realms[num_realms] = strdup(tgt_realm);
-       if(realms[num_realms] == NULL){
-           ret = ENOMEM;
-           goto free_realms;
-       }
-       num_realms++;
-    }
-    if(num_realms == 0) {
-       if(strcmp(client_realm, server_realm)) 
-           kdc_log(context, config, 0,
-                   "cross-realm %s -> %s", client_realm, server_realm);
-    } else {
-       size_t l = 0;
-       char *rs;
-       for(i = 0; i < num_realms; i++)
-           l += strlen(realms[i]) + 2;
-       rs = malloc(l);
-       if(rs != NULL) {
-           *rs = '\0';
-           for(i = 0; i < num_realms; i++) {
-               if(i > 0)
-                   strlcat(rs, ", ", l);
-               strlcat(rs, realms[i], l);
-           }
-           kdc_log(context, config, 0,
-                   "cross-realm %s -> %s via [%s]",
-                   client_realm, server_realm, rs);
-           free(rs);
-       }
-    }
-    if(check_policy) {
-       ret = krb5_check_transited(context, client_realm, 
-                                  server_realm, 
-                                  realms, num_realms, NULL);
-       if(ret) {
-           krb5_warn(context, ret, "cross-realm %s -> %s", 
-                     client_realm, server_realm);
-           goto free_realms;
-       }
-       et->flags.transited_policy_checked = 1;
-    }
-    et->transited.tr_type = DOMAIN_X500_COMPRESS;
-    ret = krb5_domain_x500_encode(realms, num_realms, &et->transited.contents);
-    if(ret)
-       krb5_warn(context, ret, "Encoding transited encoding");
-  free_realms:
-    for(i = 0; i < num_realms; i++)
-       free(realms[i]);
-    free(realms);
-    return ret;
-}
-
-
-static krb5_error_code
-tgs_make_reply(krb5_context context, 
-              krb5_kdc_configuration *config,
-              KDC_REQ_BODY *b, 
-              EncTicketPart *tgt, 
-              EncTicketPart *adtkt, 
-              AuthorizationData *auth_data,
-              krb5_ticket *tgs_ticket,
-              hdb_entry_ex *server, 
-              hdb_entry *client, 
-              krb5_principal client_principal, 
-              hdb_entry *krbtgt,
-              EncryptionKey *tgtkey,
-              krb5_enctype cetype,
-              const char **e_text,
-              krb5_data *reply)
-{
-    KDC_REP rep;
-    EncKDCRepPart ek;
-    EncTicketPart et;
-    KDCOptions f = b->kdc_options;
-    krb5_error_code ret;
-    krb5_enctype etype;
-    Key *skey;
-    EncryptionKey *ekey;
-    AuthorizationData *new_auth_data = NULL;
-    
-    if(adtkt) {
-       int i;
-       krb5_keytype kt;
-       ekey = &adtkt->key;
-       for(i = 0; i < b->etype.len; i++){
-           ret = krb5_enctype_to_keytype(context, b->etype.val[i], &kt);
-           if(ret)
-               continue;
-           if(adtkt->key.keytype == kt)
-               break;
-       }
-       if(i == b->etype.len)
-           return KRB5KDC_ERR_ETYPE_NOSUPP;
-       etype = b->etype.val[i];
-    }else{
-       ret = find_keys(context, config, 
-                       NULL, &server->entry, NULL, NULL, &skey, &etype, 
-                       b->etype.val, b->etype.len);
-       if(ret) {
-           kdc_log(context, config, 0, "Server has no support for etypes");
-           return ret;
-       }
-       ekey = &skey->key;
-    }
-    
-    memset(&rep, 0, sizeof(rep));
-    memset(&et, 0, sizeof(et));
-    memset(&ek, 0, sizeof(ek));
-    
-    rep.pvno = 5;
-    rep.msg_type = krb_tgs_rep;
-
-    et.authtime = tgt->authtime;
-    fix_time(&b->till);
-    et.endtime = min(tgt->endtime, *b->till);
-    ALLOC(et.starttime);
-    *et.starttime = kdc_time;
-    
-    ret = check_tgs_flags(context, config, b, tgt, &et);
-    if(ret)
-       goto out;
-
-    /* We should check the transited encoding if:
-       1) the request doesn't ask not to be checked
-       2) globally enforcing a check
-       3) principal requires checking
-       4) we allow non-check per-principal, but principal isn't marked as allowing this
-       5) we don't globally allow this
-    */
-
-#define GLOBAL_FORCE_TRANSITED_CHECK           \
-       (config->trpolicy == TRPOLICY_ALWAYS_CHECK)
-#define GLOBAL_ALLOW_PER_PRINCIPAL             \
-       (config->trpolicy == TRPOLICY_ALLOW_PER_PRINCIPAL)
-#define GLOBAL_ALLOW_DISABLE_TRANSITED_CHECK   \
-       (config->trpolicy == TRPOLICY_ALWAYS_HONOUR_REQUEST)
-
-/* these will consult the database in future release */
-#define PRINCIPAL_FORCE_TRANSITED_CHECK(P)             0
-#define PRINCIPAL_ALLOW_DISABLE_TRANSITED_CHECK(P)     0
-
-    ret = fix_transited_encoding(context, config, 
-                                !f.disable_transited_check ||
-                                GLOBAL_FORCE_TRANSITED_CHECK ||
-                                PRINCIPAL_FORCE_TRANSITED_CHECK(server) ||
-                                !((GLOBAL_ALLOW_PER_PRINCIPAL && 
-                                   PRINCIPAL_ALLOW_DISABLE_TRANSITED_CHECK(server)) ||
-                                  GLOBAL_ALLOW_DISABLE_TRANSITED_CHECK),
-                                &tgt->transited, &et,
-                                *krb5_princ_realm(context, client_principal),
-                                *krb5_princ_realm(context, server->entry.principal),
-                                *krb5_princ_realm(context, krbtgt->principal));
-    if(ret)
-       goto out;
-
-    copy_Realm(krb5_princ_realm(context, server->entry.principal), 
-              &rep.ticket.realm);
-    _krb5_principal2principalname(&rep.ticket.sname, server->entry.principal);
-    copy_Realm(&tgt->crealm, &rep.crealm);
-    if (f.request_anonymous)
-       make_anonymous_principalname (&tgt->cname);
-    else
-       copy_PrincipalName(&tgt->cname, &rep.cname);
-    rep.ticket.tkt_vno = 5;
-
-    ek.caddr = et.caddr;
-    if(et.caddr == NULL)
-       et.caddr = tgt->caddr;
-
-    {
-       time_t life;
-       life = et.endtime - *et.starttime;
-       if(client && client->max_life)
-           life = min(life, *client->max_life);
-       if(server->entry.max_life)
-           life = min(life, *server->entry.max_life);
-       et.endtime = *et.starttime + life;
-    }
-    if(f.renewable_ok && tgt->flags.renewable && 
-       et.renew_till == NULL && et.endtime < *b->till){
-       et.flags.renewable = 1;
-       ALLOC(et.renew_till);
-       *et.renew_till = *b->till;
-    }
-    if(et.renew_till){
-       time_t renew;
-       renew = *et.renew_till - et.authtime;
-       if(client && client->max_renew)
-           renew = min(renew, *client->max_renew);
-       if(server->entry.max_renew)
-           renew = min(renew, *server->entry.max_renew);
-       *et.renew_till = et.authtime + renew;
-    }
-           
-    if(et.renew_till){
-       *et.renew_till = min(*et.renew_till, *tgt->renew_till);
-       *et.starttime = min(*et.starttime, *et.renew_till);
-       et.endtime = min(et.endtime, *et.renew_till);
-    }
-    
-    *et.starttime = min(*et.starttime, et.endtime);
-
-    if(*et.starttime == et.endtime){
-       ret = KRB5KDC_ERR_NEVER_VALID;
-       goto out;
-    }
-    if(et.renew_till && et.endtime == *et.renew_till){
-       free(et.renew_till);
-       et.renew_till = NULL;
-       et.flags.renewable = 0;
-    }
-    
-    et.flags.pre_authent = tgt->flags.pre_authent;
-    et.flags.hw_authent  = tgt->flags.hw_authent;
-    et.flags.anonymous   = tgt->flags.anonymous;
-    et.flags.ok_as_delegate = server->entry.flags.ok_as_delegate;
-           
-    
-    krb5_generate_random_keyblock(context, etype, &et.key);
-
-    if (server->authz_data_tgs_req) {
-           ret = server->authz_data_tgs_req(context, server,
-                                            client_principal, 
-                                            tgs_ticket->ticket.authorization_data,
-                                            tgs_ticket->ticket.authtime,
-                                            tgtkey,
-                                            ekey, 
-                                            &et.key, 
-                                            &new_auth_data);
-           if (ret) {
-                   new_auth_data = NULL;
-           }
-    }
-
-    /* XXX Check enc-authorization-data */
-    et.authorization_data = new_auth_data;
-
-    et.crealm = tgt->crealm;
-    et.cname = tgt->cname;
-           
-    ek.key = et.key;
-    /* MIT must have at least one last_req */
-    ek.last_req.len = 1;
-    ek.last_req.val = calloc(1, sizeof(*ek.last_req.val));
-    ek.nonce = b->nonce;
-    ek.flags = et.flags;
-    ek.authtime = et.authtime;
-    ek.starttime = et.starttime;
-    ek.endtime = et.endtime;
-    ek.renew_till = et.renew_till;
-    ek.srealm = rep.ticket.realm;
-    ek.sname = rep.ticket.sname;
-    
-    log_timestamp(context, config, "TGS-REQ", et.authtime, et.starttime, 
-                 et.endtime, et.renew_till);
-
-    /* It is somewhat unclear where the etype in the following
-       encryption should come from. What we have is a session
-       key in the passed tgt, and a list of preferred etypes
-       *for the new ticket*. Should we pick the best possible
-       etype, given the keytype in the tgt, or should we look
-       at the etype list here as well?  What if the tgt
-       session key is DES3 and we want a ticket with a (say)
-       CAST session key. Should the DES3 etype be added to the
-       etype list, even if we don't want a session key with
-       DES3? */
-    ret = encode_reply(context, config, 
-                      &rep, &et, &ek, etype, adtkt ? 0 : server->entry.kvno, ekey,
-                      0, &tgt->key, e_text, reply);
-  out:
-    free_TGS_REP(&rep);
-    free_TransitedEncoding(&et.transited);
-    if(et.starttime)
-       free(et.starttime);
-    if(et.renew_till)
-       free(et.renew_till);
-    free_LastReq(&ek.last_req);
-    memset(et.key.keyvalue.data, 0, et.key.keyvalue.length);
-    free_EncryptionKey(&et.key);
-    return ret;
-}
-
-static krb5_error_code
-tgs_check_authenticator(krb5_context context, 
-                       krb5_kdc_configuration *config,
-                       krb5_auth_context ac,
-                       KDC_REQ_BODY *b, 
-                       const char **e_text,
-                       krb5_keyblock *key)
-{
-    krb5_authenticator auth;
-    size_t len;
-    unsigned char *buf;
-    size_t buf_size;
-    krb5_error_code ret;
-    krb5_crypto crypto;
-    
-    krb5_auth_con_getauthenticator(context, ac, &auth);
-    if(auth->cksum == NULL){
-       kdc_log(context, config, 0, "No authenticator in request");
-       ret = KRB5KRB_AP_ERR_INAPP_CKSUM;
-       goto out;
-    }
-    /*
-     * according to RFC1510 it doesn't need to be keyed,
-     * but according to the latest draft it needs to.
-     */
-    if (
-#if 0
-!krb5_checksum_is_keyed(context, auth->cksum->cksumtype)
-       ||
-#endif
- !krb5_checksum_is_collision_proof(context, auth->cksum->cksumtype)) {
-       kdc_log(context, config, 0, "Bad checksum type in authenticator: %d", 
-               auth->cksum->cksumtype);
-       ret =  KRB5KRB_AP_ERR_INAPP_CKSUM;
-       goto out;
-    }
-               
-    /* XXX should not re-encode this */
-    ASN1_MALLOC_ENCODE(KDC_REQ_BODY, buf, buf_size, b, &len, ret);
-    if(ret){
-       kdc_log(context, config, 0, "Failed to encode KDC-REQ-BODY: %s", 
-               krb5_get_err_text(context, ret));
-       goto out;
-    }
-    if(buf_size != len) {
-       free(buf);
-       kdc_log(context, config, 0, "Internal error in ASN.1 encoder");
-       *e_text = "KDC internal error";
-       ret = KRB5KRB_ERR_GENERIC;
-       goto out;
-    }
-    ret = krb5_crypto_init(context, key, 0, &crypto);
-    if (ret) {
-       free(buf);
-       kdc_log(context, config, 0, "krb5_crypto_init failed: %s",
-               krb5_get_err_text(context, ret));
-       goto out;
-    }
-    ret = krb5_verify_checksum(context,
-                              crypto,
-                              KRB5_KU_TGS_REQ_AUTH_CKSUM,
-                              buf, 
-                              len,
-                              auth->cksum);
-    free(buf);
-    krb5_crypto_destroy(context, crypto);
-    if(ret){
-       kdc_log(context, config, 0,
-               "Failed to verify authenticator checksum: %s", 
-               krb5_get_err_text(context, ret));
-    }
-out:
-    free_Authenticator(auth);
-    free(auth);
-    return ret;
-}
-
 /*
- * return the realm of a krbtgt-ticket or NULL
+ * Add the AuthorizationData `data´ of `type´ to the last element in
+ * the sequence of authorization_data in `tkt´ wrapped in an IF_RELEVANT
  */
 
-static Realm 
-get_krbtgt_realm(const PrincipalName *p)
-{
-    if(p->name_string.len == 2
-       && strcmp(p->name_string.val[0], KRB5_TGS_NAME) == 0)
-       return p->name_string.val[1];
-    else
-       return NULL;
-}
-
-static const char *
-find_rpath(krb5_context context, Realm crealm, Realm srealm)
-{
-    const char *new_realm = krb5_config_get_string(context,
-                                                  NULL,
-                                                  "capaths", 
-                                                  crealm,
-                                                  srealm,
-                                                  NULL);
-    return new_realm;
-}
-           
-
-static krb5_boolean
-need_referral(krb5_context context, krb5_principal server, krb5_realm **realms)
-{
-    if(server->name.name_type != KRB5_NT_SRV_INST ||
-       server->name.name_string.len != 2)
-       return FALSE;
-    return _krb5_get_host_realm_int(context, server->name.name_string.val[1],
-                                   FALSE, realms) == 0;
-}
-
-static krb5_error_code
-tgs_rep2(krb5_context context, 
-        krb5_kdc_configuration *config,
-        KDC_REQ_BODY *b,
-        PA_DATA *tgs_req,
-        krb5_data *reply,
-        const char *from,
-        const struct sockaddr *from_addr,
-        time_t **csec,
-        int **cusec)
+krb5_error_code
+_kdc_tkt_add_if_relevant_ad(krb5_context context,
+                           EncTicketPart *tkt,
+                           int type,
+                           const krb5_data *data)
 {
-    krb5_ap_req ap_req;
     krb5_error_code ret;
-    krb5_principal princ;
-    krb5_auth_context ac = NULL;
-    krb5_ticket *ticket = NULL;
-    krb5_flags ap_req_options;
-    krb5_flags verify_ap_req_flags;
-    const char *e_text = NULL;
-    krb5_crypto crypto;
-
-    hdb_entry *krbtgt = NULL;
-    EncTicketPart *tgt;
-    Key *tkey;
-    krb5_enctype cetype;
-    krb5_principal cp = NULL;
-    krb5_principal sp = NULL;
-    AuthorizationData *auth_data = NULL;
-
-    *csec  = NULL;
-    *cusec = NULL;
-
-    memset(&ap_req, 0, sizeof(ap_req));
-    ret = krb5_decode_ap_req(context, &tgs_req->padata_value, &ap_req);
-    if(ret){
-       kdc_log(context, config, 0, "Failed to decode AP-REQ: %s", 
-               krb5_get_err_text(context, ret));
-       goto out2;
-    }
-    
-    if(!get_krbtgt_realm(&ap_req.ticket.sname)){
-       /* XXX check for ticket.sname == req.sname */
-       kdc_log(context, config, 0, "PA-DATA is not a ticket-granting ticket");
-       ret = KRB5KDC_ERR_POLICY; /* ? */
-       goto out2;
-    }
-    
-    _krb5_principalname2krb5_principal(&princ,
-                                      ap_req.ticket.sname,
-                                      ap_req.ticket.realm);
-    
-    ret = _kdc_db_fetch(context, config, princ, HDB_ENT_TYPE_SERVER, &krbtgt);
+    size_t size;
 
-    if(ret) {
-       char *p;
-       ret = krb5_unparse_name(context, princ, &p);
-       if (ret != 0)
-           p = "<unparse_name failed>";
-       krb5_free_principal(context, princ);
-       kdc_log(context, config, 0,
-               "Ticket-granting ticket not found in database: %s: %s",
-               p, krb5_get_err_text(context, ret));
-       if (ret == 0)
-           free(p);
-       ret = KRB5KRB_AP_ERR_NOT_US;
-       goto out2;
-    }
-    
-    if(ap_req.ticket.enc_part.kvno && 
-       *ap_req.ticket.enc_part.kvno != krbtgt->kvno){
-       char *p;
-
-       ret = krb5_unparse_name (context, princ, &p);
-       krb5_free_principal(context, princ);
-       if (ret != 0)
-           p = "<unparse_name failed>";
-       kdc_log(context, config, 0,
-               "Ticket kvno = %d, DB kvno = %d (%s)", 
-               *ap_req.ticket.enc_part.kvno,
-               krbtgt->kvno,
-               p);
-       if (ret == 0)
-           free (p);
-       ret = KRB5KRB_AP_ERR_BADKEYVER;
-       goto out2;
-    }
-
-    ret = hdb_enctype2key(context, krbtgt, ap_req.ticket.enc_part.etype, &tkey);
-    if(ret){
-       char *str;
-       krb5_enctype_to_string(context, ap_req.ticket.enc_part.etype, &str);
-       kdc_log(context, config, 0,
-               "No server key found for %s", str);
-       free(str);
-       ret = KRB5KRB_AP_ERR_BADKEYVER;
-       goto out2;
-    }
-    
-    if (b->kdc_options.validate)
-       verify_ap_req_flags = KRB5_VERIFY_AP_REQ_IGNORE_INVALID;
-    else
-       verify_ap_req_flags = 0;
-
-    ret = krb5_verify_ap_req2(context,
-                             &ac,
-                             &ap_req,
-                             princ,
-                             &tkey->key,
-                             verify_ap_req_flags,
-                             &ap_req_options,
-                             &ticket,
-                             KRB5_KU_TGS_REQ_AUTH);
-                            
-    krb5_free_principal(context, princ);
-    if(ret) {
-       kdc_log(context, config, 0, "Failed to verify AP-REQ: %s", 
-               krb5_get_err_text(context, ret));
-       goto out2;
-    }
-
-    {
-       krb5_authenticator auth;
-
-       ret = krb5_auth_con_getauthenticator(context, ac, &auth);
-       if (ret == 0) {
-           *csec   = malloc(sizeof(**csec));
-           if (*csec == NULL) {
-               krb5_free_authenticator(context, &auth);
-               kdc_log(context, config, 0, "malloc failed");
-               goto out2;
-           }
-           **csec  = auth->ctime;
-           *cusec  = malloc(sizeof(**cusec));
-           if (*cusec == NULL) {
-               krb5_free_authenticator(context, &auth);
-               kdc_log(context, config, 0, "malloc failed");
-               goto out2;
-           }
-           **csec  = auth->cusec;
-           krb5_free_authenticator(context, &auth);
-       }
-    }
-
-    cetype = ap_req.authenticator.etype;
-
-    tgt = &ticket->ticket;
-
-    ret = tgs_check_authenticator(context, config, 
-                                 ac, b, &e_text, &tgt->key);
-    if (ret) {
-       krb5_auth_con_free(context, ac);
-       goto out2;
-    }
-
-    if (b->enc_authorization_data) {
-       krb5_keyblock *subkey;
-       krb5_data ad;
-       ret = krb5_auth_con_getremotesubkey(context,
-                                           ac,
-                                           &subkey);
-       if(ret){
-           krb5_auth_con_free(context, ac);
-           kdc_log(context, config, 0, "Failed to get remote subkey: %s", 
-                   krb5_get_err_text(context, ret));
-           goto out2;
-       }
-       if(subkey == NULL){
-           ret = krb5_auth_con_getkey(context, ac, &subkey);
-           if(ret) {
-               krb5_auth_con_free(context, ac);
-               kdc_log(context, config, 0, "Failed to get session key: %s", 
-                       krb5_get_err_text(context, ret));
-               goto out2;
-           }
-       }
-       if(subkey == NULL){
-           krb5_auth_con_free(context, ac);
-           kdc_log(context, config, 0,
-                   "Failed to get key for enc-authorization-data");
-           ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; /* ? */
-           goto out2;
-       }
-       ret = krb5_crypto_init(context, subkey, 0, &crypto);
-       if (ret) {
-           krb5_auth_con_free(context, ac);
-           kdc_log(context, config, 0, "krb5_crypto_init failed: %s",
-                   krb5_get_err_text(context, ret));
-           goto out2;
-       }
-       ret = krb5_decrypt_EncryptedData (context,
-                                         crypto,
-                                         KRB5_KU_TGS_REQ_AUTH_DAT_SUBKEY,
-                                         b->enc_authorization_data,
-                                         &ad);
-       krb5_crypto_destroy(context, crypto);
-       if(ret){
-           krb5_auth_con_free(context, ac);
-           kdc_log(context, config, 0, "Failed to decrypt enc-authorization-data");
-           ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; /* ? */
-           goto out2;
-       }
-       krb5_free_keyblock(context, subkey);
-       ALLOC(auth_data);
-       ret = decode_AuthorizationData(ad.data, ad.length, auth_data, NULL);
-       if(ret){
-           krb5_auth_con_free(context, ac);
-           free(auth_data);
-           auth_data = NULL;
-           kdc_log(context, config, 0, "Failed to decode authorization data");
-           ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; /* ? */
-           goto out2;
+    if (tkt->authorization_data == NULL) {
+       tkt->authorization_data = calloc(1, sizeof(*tkt->authorization_data));
+       if (tkt->authorization_data == NULL) {
+           krb5_set_error_string(context, "out of memory");
+           return ENOMEM;
        }
     }
-
-    krb5_auth_con_free(context, ac);
-
+       
+    /* add the entry to the last element */
     {
-       PrincipalName *s;
-       Realm r;
-       char *spn = NULL, *cpn = NULL;
-       hdb_entry_ex *server = NULL;
-       hdb_entry *client = NULL;
-       int nloop = 0;
-       EncTicketPart adtkt;
-       char opt_str[128];
-
-       s = b->sname;
-       r = b->realm;
-       if(b->kdc_options.enc_tkt_in_skey){
-           Ticket *t;
-           hdb_entry *uu;
-           krb5_principal p;
-           Key *uukey;
-           
-           if(b->additional_tickets == NULL || 
-              b->additional_tickets->len == 0){
-               ret = KRB5KDC_ERR_BADOPTION; /* ? */
-               kdc_log(context, config, 0,
-                       "No second ticket present in request");
-               goto out;
-           }
-           t = &b->additional_tickets->val[0];
-           if(!get_krbtgt_realm(&t->sname)){
-               kdc_log(context, config, 0,
-                       "Additional ticket is not a ticket-granting ticket");
-               ret = KRB5KDC_ERR_POLICY;
-               goto out2;
-           }
-           _krb5_principalname2krb5_principal(&p, t->sname, t->realm);
-           ret = _kdc_db_fetch(context, config, p, HDB_ENT_TYPE_SERVER, &uu);
-           krb5_free_principal(context, p);
-           if(ret){
-               if (ret == HDB_ERR_NOENTRY)
-                   ret = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN;
-               goto out;
-           }
-           ret = hdb_enctype2key(context, uu, t->enc_part.etype, &uukey);
-           if(ret){
-               ret = KRB5KDC_ERR_ETYPE_NOSUPP; /* XXX */
-               goto out;
-           }
-           ret = krb5_decrypt_ticket(context, t, &uukey->key, &adtkt, 0);
+       AuthorizationData ad = { 0, NULL };
+       AuthorizationDataElement ade;
 
-           if(ret)
-               goto out;
-           s = &adtkt.cname;
-           r = adtkt.crealm;
-       }
+       ade.ad_type = type;
+       ade.ad_data = *data;
 
-       _krb5_principalname2krb5_principal(&sp, *s, r);
-       ret = krb5_unparse_name(context, sp, &spn);     
-       if (ret)
-           goto out;
-       _krb5_principalname2krb5_principal(&cp, tgt->cname, tgt->crealm);
-       ret = krb5_unparse_name(context, cp, &cpn);
-       if (ret)
-           goto out;
-       unparse_flags (KDCOptions2int(b->kdc_options),
-                      asn1_KDCOptions_units(),
-                      opt_str, sizeof(opt_str));
-       if(*opt_str)
-           kdc_log(context, config, 0,
-                   "TGS-REQ %s from %s for %s [%s]", 
-                   cpn, from, spn, opt_str);
-       else
-           kdc_log(context, config, 0,
-                   "TGS-REQ %s from %s for %s", cpn, from, spn);
-    server_lookup:
-       ret = _kdc_db_fetch_ex(context, config, sp, HDB_ENT_TYPE_SERVER, &server);
-
-       if(ret){
-           const char *new_rlm;
-           Realm req_rlm;
-           krb5_realm *realms;
-
-           if ((req_rlm = get_krbtgt_realm(&sp->name)) != NULL) {
-               if(nloop++ < 2) {
-                   new_rlm = find_rpath(context, tgt->crealm, req_rlm);
-                   if(new_rlm) {
-                       kdc_log(context, config, 5, "krbtgt for realm %s not found, trying %s", 
-                               req_rlm, new_rlm);
-                       krb5_free_principal(context, sp);
-                       free(spn);
-                       krb5_make_principal(context, &sp, r, 
-                                           KRB5_TGS_NAME, new_rlm, NULL);
-                       ret = krb5_unparse_name(context, sp, &spn);     
-                       if (ret)
-                           goto out;
-                       goto server_lookup;
-                   }
-               }
-           } else if(need_referral(context, sp, &realms)) {
-               if (strcmp(realms[0], sp->realm) != 0) {
-                   kdc_log(context, config, 5,
-                           "Returning a referral to realm %s for "
-                           "server %s that was not found",
-                           realms[0], spn);
-                   krb5_free_principal(context, sp);
-                   free(spn);
-                   krb5_make_principal(context, &sp, r, KRB5_TGS_NAME,
-                                       realms[0], NULL);
-                   ret = krb5_unparse_name(context, sp, &spn);
-                   if (ret)
-                       goto out;
-                   krb5_free_host_realm(context, realms);
-                   goto server_lookup;
-               }
-               krb5_free_host_realm(context, realms);
-           }
-           kdc_log(context, config, 0,
-                   "Server not found in database: %s: %s", spn,
-                   krb5_get_err_text(context, ret));
-           if (ret == HDB_ERR_NOENTRY)
-               ret = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN;
-           goto out;
-       }
-
-       ret = _kdc_db_fetch(context, config, cp, HDB_ENT_TYPE_CLIENT, &client);
-       if(ret)
-           kdc_log(context, config, 1, "Client not found in database: %s: %s",
-                   cpn, krb5_get_err_text(context, ret));
-#if 0
-       /* XXX check client only if same realm as krbtgt-instance */
-       if(ret){
-           kdc_log(context, config, 0,
-                   "Client not found in database: %s: %s",
-                   cpn, krb5_get_err_text(context, ret));
-           if (ret == HDB_ERR_NOENTRY)
-               ret = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN;
-           goto out;
-       }
-#endif
-
-       if(strcmp(krb5_principal_get_realm(context, sp),
-                 krb5_principal_get_comp_string(context, krbtgt->principal, 1)) != 0) {
-           char *tpn;
-           ret = krb5_unparse_name(context, krbtgt->principal, &tpn);
-           kdc_log(context, config, 0,
-                   "Request with wrong krbtgt: %s",
-                   (ret == 0) ? tpn : "<unknown>");
-           if(ret == 0)
-               free(tpn);
-           ret = KRB5KRB_AP_ERR_NOT_US;
-           goto out;
-           
+       ret = add_AuthorizationData(&ad, &ade);
+       if (ret) {
+           krb5_set_error_string(context, "add AuthorizationData failed");
+           return ret;
        }
 
-       ret = _kdc_check_flags(context, config, 
-                              client, cpn,
-                              &server->entry, spn,
-                              FALSE);
-       if(ret)
-           goto out;
-
-       if((b->kdc_options.validate || b->kdc_options.renew) && 
-          !krb5_principal_compare(context, 
-                                  krbtgt->principal,
-                                  server->entry.principal)){
-           kdc_log(context, config, 0, "Inconsistent request.");
-           ret = KRB5KDC_ERR_SERVER_NOMATCH;
-           goto out;
-       }
+       ade.ad_type = KRB5_AUTHDATA_IF_RELEVANT;
 
-       /* check for valid set of addresses */
-       if(!check_addresses(context, config, tgt->caddr, from_addr)) {
-           ret = KRB5KRB_AP_ERR_BADADDR;
-           kdc_log(context, config, 0, "Request from wrong address");
-           goto out;
+       ASN1_MALLOC_ENCODE(AuthorizationData, 
+                          ade.ad_data.data, ade.ad_data.length, 
+                          &ad, &size, ret);
+       free_AuthorizationData(&ad);
+       if (ret) {
+           krb5_set_error_string(context, "ASN.1 encode of "
+                                 "AuthorizationData failed");
+           return ret;
        }
+       if (ade.ad_data.length != size)
+           krb5_abortx(context, "internal asn.1 encoder error");
        
-       ret = tgs_make_reply(context, config, 
-                            b, 
-                            tgt, 
-                            b->kdc_options.enc_tkt_in_skey ? &adtkt : NULL, 
-                            auth_data,
-                            ticket,
-                            server, 
-                            client, 
-                            cp, 
-                            krbtgt, 
-                            &tkey->key,
-                            cetype, 
-                            &e_text,
-                            reply);
-       
-    out:
-       free(spn);
-       free(cpn);
-           
-       if(server)
-           _kdc_free_ent_ex(context, server);
-       if(client)
-           _kdc_free_ent(context, client);
-    }
- out2:
-    if(ret) {
-       krb5_mk_error(context,
-                     ret,
-                     e_text,
-                     NULL,
-                     cp,
-                     sp,
-                     NULL,
-                     NULL,
-                     reply);
-       free(*csec);
-       free(*cusec);
-       *csec  = NULL;
-       *cusec = NULL;
-    }
-    krb5_free_principal(context, cp);
-    krb5_free_principal(context, sp);
-    if (ticket)
-       krb5_free_ticket(context, ticket);
-    free_AP_REQ(&ap_req);
-    if(auth_data){
-       free_AuthorizationData(auth_data);
-       free(auth_data);
-    }
-
-    if(krbtgt)
-       _kdc_free_ent(context, krbtgt);
-
-    return ret;
-}
-
-
-krb5_error_code
-_kdc_tgs_rep(krb5_context context, 
-            krb5_kdc_configuration *config,
-            KDC_REQ *req, 
-            krb5_data *data,
-            const char *from,
-            struct sockaddr *from_addr)
-{
-    krb5_error_code ret;
-    int i = 0;
-    PA_DATA *tgs_req = NULL;
-    time_t *csec = NULL;
-    int *cusec = NULL;
-
-    if(req->padata == NULL){
-       ret = KRB5KDC_ERR_PREAUTH_REQUIRED; /* XXX ??? */
-       kdc_log(context, config, 0,
-               "TGS-REQ from %s without PA-DATA", from);
-       goto out;
+       ret = add_AuthorizationData(tkt->authorization_data, &ade);
+       der_free_octet_string(&ade.ad_data);
+       if (ret) {
+           krb5_set_error_string(context, "add AuthorizationData failed");
+           return ret;
+       }
     }
-    
-    tgs_req = find_padata(req, &i, KRB5_PADATA_TGS_REQ);
 
-    if(tgs_req == NULL){
-       ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;
-       
-       kdc_log(context, config, 0, 
-               "TGS-REQ from %s without PA-TGS-REQ", from);
-       goto out;
-    }
-    ret = tgs_rep2(context, config, 
-                  &req->req_body, tgs_req, data, from, from_addr,
-                  &csec, &cusec);
-out:
-    if(ret && data->data == NULL){
-       krb5_mk_error(context,
-                     ret,
-                     NULL,
-                     NULL,
-                     NULL,
-                     NULL,
-                     csec,
-                     cusec,
-                     data);
-    }
-    free(csec);
-    free(cusec);
     return 0;
 }