Changeset 988 for vendor/current/source4/kdc/db-glue.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/kdc/db-glue.c (modified) (86 diffs)

vendor/current/source4/kdc/db-glue.c

@@ -33 +33 @@
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include <hdb.h>
+#include "kdc/sdb.h"
 #include "kdc/samba_kdc.h"
-#include "kdc/kdc-policy.h"
+#include "kdc/db-glue.h"
 
 #define SAMBA_KVNO_GET_KRBTGT(kvno) \
@@ -66 +66 @@
 };
 
-static KerberosTime ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, const char *attr, KerberosTime default_val)
+
+static time_t ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, const char *attr, time_t default_val)
 {
     const char *tmp;
@@ -84 +85 @@
 }
 
-static HDBFlags uf2HDBFlags(krb5_context context, uint32_t userAccountControl, enum samba_kdc_ent_type ent_type)
+static struct SDBFlags uf2SDBFlags(krb5_context context, uint32_t userAccountControl, enum samba_kdc_ent_type ent_type)
 {
-        HDBFlags flags = int2HDBFlags(0);
+        struct SDBFlags flags = int2SDBFlags(0);
 
         /* we don't allow kadmin deletes */
@@ -131 +132 @@
         }
         if (userAccountControl & UF_LOCKOUT) {
-                flags.invalid = 1;
+                flags.locked_out = 1;
         }
 /*
@@ -158 +159 @@
                 flags.ok_as_delegate = 1;
         }
+        if (userAccountControl & UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION) {
+                /*
+                 * this is confusing...
+                 *
+                 * UF_TRUSTED_FOR_DELEGATION
+                 * => ok_as_delegate
+                 *
+                 * and
+                 *
+                 * UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION
+                 * => trusted_for_delegation
+                 */
+                flags.trusted_for_delegation = 1;
+        }
         if (!(userAccountControl & UF_NOT_DELEGATED)) {
                 flags.forwardable = 1;
@@ -174 +189 @@
 static int samba_kdc_entry_destructor(struct samba_kdc_entry *p)
 {
-    hdb_entry_ex *entry_ex = p->entry_ex;
-    free_hdb_entry(&entry_ex->entry);
-    return 0;
-}
-
-static void samba_kdc_free_entry(krb5_context context, hdb_entry_ex *entry_ex)
-{
-        /* this function is called only from hdb_free_entry().
-         * Make sure we neutralize the destructor or we will
-         * get a double free later when hdb_free_entry() will
-         * try to call free_hdb_entry() */
-        talloc_set_destructor(entry_ex->ctx, NULL);
-
-        /* now proceed to free the talloc part */
-        talloc_free(entry_ex->ctx);
+        if (p->entry_ex != NULL) {
+                struct sdb_entry_ex *entry_ex = p->entry_ex;
+                free_sdb_entry(&entry_ex->entry);
+        }
+
+        return 0;
 }
 
@@ -199 +205 @@
                                                     uint32_t userAccountControl,
                                                     enum samba_kdc_ent_type ent_type,
-                                                    hdb_entry_ex *entry_ex)
+                                                    struct sdb_entry_ex *entry_ex)
 {
         krb5_error_code ret = 0;
@@ -359 +365 @@
                 if (kdc_db_ctx->rodc) {
                         /* We are on an RODC, but don't have keys for this account.  Signal this to the caller */
-                        return HDB_ERR_NOT_FOUND_HERE;
+                        /* TODO:  We need to call a generalised version of auth_sam_trigger_repl_secret from here */
+                        return SDB_ERR_NOT_FOUND_HERE;
                 }
 
@@ -370 +377 @@
         /* allocate space to decode into */
         entry_ex->entry.keys.len = 0;
-        entry_ex->entry.keys.val = calloc(allocated_keys, sizeof(Key));
+        entry_ex->entry.keys.val = calloc(allocated_keys, sizeof(struct sdb_key));
         if (entry_ex->entry.keys.val == NULL) {
                 ret = ENOMEM;
@@ -377 +384 @@
 
         if (hash && (supported_enctypes & ENC_RC4_HMAC_MD5)) {
-                Key key;
-
-                key.mkvno = 0;
-                key.salt = NULL; /* No salt for this enc type */
-
-                ret = krb5_keyblock_init(context,
-                                         ENCTYPE_ARCFOUR_HMAC,
-                                         hash->hash, sizeof(hash->hash),
-                                         &key.key);
+                struct sdb_key key = {};
+
+                ret = smb_krb5_keyblock_init_contents(context,
+                                                      ENCTYPE_ARCFOUR_HMAC,
+                                                      hash->hash,
+                                                      sizeof(hash->hash),
+                                                      &key.key);
                 if (ret) {
                         goto out;
@@ -396 +401 @@
         if (pkb4) {
                 for (i=0; i < pkb4->num_keys; i++) {
-                        Key key;
+                        struct sdb_key key = {};
 
                         if (!pkb4->keys[i].value) continue;
@@ -403 +408 @@
                                 continue;
                         }
-
-                        key.mkvno = 0;
-                        key.salt = NULL;
 
                         if (pkb4->salt.string) {
@@ -418 +420 @@
                                 }
 
-                                key.salt->type = hdb_pw_salt;
-
-                                ret = krb5_data_copy(&key.salt->salt, salt.data, salt.length);
+                                key.salt->type = KRB5_PW_SALT;
+
+                                ret = krb5_copy_data_contents(&key.salt->salt,
+                                                              salt.data,
+                                                              salt.length);
                                 if (ret) {
                                         free(key.salt);
@@ -430 +434 @@
                         /* TODO: maybe pass the iteration_count somehow... */
 
-                        ret = krb5_keyblock_init(context,
-                                                 pkb4->keys[i].keytype,
-                                                 pkb4->keys[i].value->data,
-                                                 pkb4->keys[i].value->length,
-                                                 &key.key);
+                        ret = smb_krb5_keyblock_init_contents(context,
+                                                              pkb4->keys[i].keytype,
+                                                              pkb4->keys[i].value->data,
+                                                              pkb4->keys[i].value->length,
+                                                              &key.key);
                         if (ret == KRB5_PROG_ETYPE_NOSUPP) {
                                 DEBUG(2,("Unsupported keytype ignored - type %u\n",
@@ -443 +447 @@
                         if (ret) {
                                 if (key.salt) {
-                                        free_Salt(key.salt);
+                                        kerberos_free_data_contents(context, &key.salt->salt);
                                         free(key.salt);
                                         key.salt = NULL;
@@ -455 +459 @@
         } else if (pkb3) {
                 for (i=0; i < pkb3->num_keys; i++) {
-                        Key key;
+                        struct sdb_key key = {};
 
                         if (!pkb3->keys[i].value) continue;
@@ -462 +466 @@
                                 continue;
                         }
-
-                        key.mkvno = 0;
-                        key.salt = NULL;
 
                         if (pkb3->salt.string) {
@@ -477 +478 @@
                                 }
 
-                                key.salt->type = hdb_pw_salt;
-
-                                ret = krb5_data_copy(&key.salt->salt, salt.data, salt.length);
+                                key.salt->type = KRB5_PW_SALT;
+
+                                ret = krb5_copy_data_contents(&key.salt->salt,
+                                                              salt.data,
+                                                              salt.length);
                                 if (ret) {
                                         free(key.salt);
@@ -487 +490 @@
                         }
 
-                        ret = krb5_keyblock_init(context,
-                                                 pkb3->keys[i].keytype,
-                                                 pkb3->keys[i].value->data,
-                                                 pkb3->keys[i].value->length,
-                                                 &key.key);
+                        ret = smb_krb5_keyblock_init_contents(context,
+                                                              pkb3->keys[i].keytype,
+                                                              pkb3->keys[i].value->data,
+                                                              pkb3->keys[i].value->length,
+                                                              &key.key);
                         if (ret) {
                                 if (key.salt) {
-                                        free_Salt(key.salt);
+                                        kerberos_free_data_contents(context, &key.salt->salt);
                                         free(key.salt);
                                         key.salt = NULL;
@@ -515 +518 @@
         }
         return ret;
+}
+
+static int principal_comp_strcmp_int(krb5_context context,
+                                     krb5_const_principal principal,
+                                     unsigned int component,
+                                     const char *string,
+                                     bool do_strcasecmp)
+{
+        const char *p;
+        size_t len;
+
+#if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING)
+        p = krb5_principal_get_comp_string(context, principal, component);
+        if (p == NULL) {
+                return -1;
+        }
+        len = strlen(p);
+#else
+        krb5_data *d;
+        if (component >= krb5_princ_size(context, principal)) {
+                return -1;
+        }
+
+        d = krb5_princ_component(context, principal, component);
+        if (d == NULL) {
+                return -1;
+        }
+
+        p = d->data;
+        len = d->length;
+#endif
+        if (do_strcasecmp) {
+                return strncasecmp(p, string, len);
+        } else {
+                return strncmp(p, string, len);
+        }
+}
+
+static int principal_comp_strcasecmp(krb5_context context,
+                                     krb5_const_principal principal,
+                                     unsigned int component,
+                                     const char *string)
+{
+        return principal_comp_strcmp_int(context, principal,
+                                         component, string, true);
+}
+
+static int principal_comp_strcmp(krb5_context context,
+                                 krb5_const_principal principal,
+                                 unsigned int component,
+                                 const char *string)
+{
+        return principal_comp_strcmp_int(context, principal,
+                                         component, string, false);
 }
 
@@ -522 +579 @@
 static krb5_error_code samba_kdc_message2entry(krb5_context context,
                                                struct samba_kdc_db_context *kdc_db_ctx,
-                                               TALLOC_CTX *mem_ctx, krb5_const_principal principal,
+                                               TALLOC_CTX *mem_ctx,
+                                               krb5_const_principal principal,
                                                enum samba_kdc_ent_type ent_type,
                                                unsigned flags,
                                                struct ldb_dn *realm_dn,
                                                struct ldb_message *msg,
-                                               hdb_entry_ex *entry_ex)
+                                               struct sdb_entry_ex *entry_ex)
 {
         struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
         uint32_t userAccountControl;
+        uint32_t msDS_User_Account_Control_Computed;
         unsigned int i;
         krb5_error_code ret = 0;
@@ -563 +622 @@
         }
 
-        memset(entry_ex, 0, sizeof(*entry_ex));
-
-        p = talloc(mem_ctx, struct samba_kdc_entry);
+        ZERO_STRUCTP(entry_ex);
+
+        p = talloc_zero(mem_ctx, struct samba_kdc_entry);
         if (!p) {
                 ret = ENOMEM;
@@ -572 +631 @@
 
         p->kdc_db_ctx = kdc_db_ctx;
-        p->entry_ex = entry_ex;
         p->realm_dn = talloc_reference(p, realm_dn);
         if (!p->realm_dn) {
@@ -581 +639 @@
         talloc_set_destructor(p, samba_kdc_entry_destructor);
 
-        /* make sure we do not have bogus data in there */
-        memset(&entry_ex->entry, 0, sizeof(hdb_entry));
-
         entry_ex->ctx = p;
-        entry_ex->free_entry = samba_kdc_free_entry;
 
         userAccountControl = ldb_msg_find_attr_as_uint(msg, "userAccountControl", 0);
 
-
-        entry_ex->entry.principal = malloc(sizeof(*(entry_ex->entry.principal)));
-        if (ent_type == SAMBA_KDC_ENT_TYPE_ANY && principal == NULL) {
-                krb5_make_principal(context, &entry_ex->entry.principal, lpcfg_realm(lp_ctx), samAccountName, NULL);
+        msDS_User_Account_Control_Computed
+                = ldb_msg_find_attr_as_uint(msg,
+                                            "msDS-User-Account-Control-Computed",
+                                            UF_ACCOUNTDISABLE);
+
+        /*
+         * This brings in the lockout flag, block the account if not
+         * found.  We need the weird UF_ACCOUNTDISABLE check because
+         * we do not want to fail open if the value is not returned,
+         * but 0 is a valid value (all OK)
+         */
+        if (msDS_User_Account_Control_Computed == UF_ACCOUNTDISABLE) {
+                ret = EINVAL;
+                krb5_set_error_message(context, ret, "samba_kdc_message2entry: "
+                                "no msDS-User-Account-Control-Computed present");
+                goto out;
         } else {
-                ret = copy_Principal(principal, entry_ex->entry.principal);
+                userAccountControl |= msDS_User_Account_Control_Computed;
+        }
+
+        /* 
+         * If we are set to canonicalize, we get back the fixed UPPER
+         * case realm, and the real username (ie matching LDAP
+         * samAccountName) 
+         *
+         * Otherwise, if we are set to enterprise, we
+         * get back the whole principal as-sent 
+         *
+         * Finally, if we are not set to canonicalize, we get back the
+         * fixed UPPER case realm, but the as-sent username
+         */
+
+        if (ent_type == SAMBA_KDC_ENT_TYPE_KRBTGT) {
+                if (flags & (SDB_F_CANON)) {
+                        /*
+                         * When requested to do so, ensure that the
+                         * both realm values in the principal are set
+                         * to the upper case, canonical realm
+                         */
+                        ret = smb_krb5_make_principal(context, &entry_ex->entry.principal,
+                                                      lpcfg_realm(lp_ctx), "krbtgt",
+                                                      lpcfg_realm(lp_ctx), NULL);
+                        if (ret) {
+                                krb5_clear_error_message(context);
+                                goto out;
+                        }
+                        smb_krb5_principal_set_type(context, entry_ex->entry.principal, KRB5_NT_SRV_INST);
+                } else {
+                        ret = krb5_copy_principal(context, principal, &entry_ex->entry.principal);
+                        if (ret) {
+                                krb5_clear_error_message(context);
+                                goto out;
+                        }
+                        /*
+                         * this appears to be required regardless of
+                         * the canonicalize flag from the client
+                         */
+                        ret = smb_krb5_principal_set_realm(context, entry_ex->entry.principal, lpcfg_realm(lp_ctx));
+                        if (ret) {
+                                krb5_clear_error_message(context);
+                                goto out;
+                        }
+                }
+
+        } else if (ent_type == SAMBA_KDC_ENT_TYPE_ANY && principal == NULL) {
+                ret = smb_krb5_make_principal(context, &entry_ex->entry.principal, lpcfg_realm(lp_ctx), samAccountName, NULL);
                 if (ret) {
                         krb5_clear_error_message(context);
                         goto out;
                 }
-
-                /* While we have copied the client principal, tests
-                 * show that Win2k3 returns the 'corrected' realm, not
-                 * the client-specified realm.  This code attempts to
-                 * replace the client principal's realm with the one
-                 * we determine from our records */
-
-                /* this has to be with malloc() */
-                krb5_principal_set_realm(context, entry_ex->entry.principal, lpcfg_realm(lp_ctx));
+        } else if (flags & SDB_F_CANON && flags & SDB_F_FOR_AS_REQ) {
+                /*
+                 * SDB_F_CANON maps from the canonicalize flag in the
+                 * packet, and has a different meaning between AS-REQ
+                 * and TGS-REQ.  We only change the principal in the AS-REQ case
+                 */
+                ret = smb_krb5_make_principal(context, &entry_ex->entry.principal, lpcfg_realm(lp_ctx), samAccountName, NULL);
+                if (ret) {
+                        krb5_clear_error_message(context);
+                        goto out;
+                }
+        } else {
+                ret = krb5_copy_principal(context, principal, &entry_ex->entry.principal);
+                if (ret) {
+                        krb5_clear_error_message(context);
+                        goto out;
+                }
+
+                if (smb_krb5_principal_get_type(context, principal) != KRB5_NT_ENTERPRISE_PRINCIPAL) {
+                        /* While we have copied the client principal, tests
+                         * show that Win2k3 returns the 'corrected' realm, not
+                         * the client-specified realm.  This code attempts to
+                         * replace the client principal's realm with the one
+                         * we determine from our records */
+                        
+                        /* this has to be with malloc() */
+                        ret = smb_krb5_principal_set_realm(context, entry_ex->entry.principal, lpcfg_realm(lp_ctx));
+                        if (ret) {
+                                krb5_clear_error_message(context);
+                                goto out;
+                        }
+                }
         }
 
         /* First try and figure out the flags based on the userAccountControl */
-        entry_ex->entry.flags = uf2HDBFlags(context, userAccountControl, ent_type);
+        entry_ex->entry.flags = uf2SDBFlags(context, userAccountControl, ent_type);
 
         /* Windows 2008 seems to enforce this (very sensible) rule by
@@ -624 +761 @@
                 }
         }
-
-        if (flags & HDB_F_ADMIN_DATA) {
+        /*
+         * To give the correct type of error to the client, we must
+         * not just return the entry without .server set, we must
+         * pretend the principal does not exist.  Otherwise we may
+         * return ERR_POLICY instead of
+         * KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN
+         */
+        if (ent_type == SAMBA_KDC_ENT_TYPE_SERVER && entry_ex->entry.flags.server == 0) {
+                ret = SDB_ERR_NOENTRY;
+                krb5_set_error_message(context, ret, "samba_kdc_message2entry: no servicePrincipalName present for this server, refusing with no-such-entry");
+                goto out;
+        }
+        if (flags & SDB_F_ADMIN_DATA) {
                 /* These (created_by, modified_by) parts of the entry are not relevant for Samba4's use
                  * of the Heimdal KDC.  They are stored in a the traditional
@@ -634 +782 @@
                 entry_ex->entry.created_by.time = ldb_msg_find_krb5time_ldap_time(msg, "whenCreated", 0);
                 /* use 'kadmin' for now (needed by mit_samba) */
-                krb5_make_principal(context,
-                                    &entry_ex->entry.created_by.principal,
-                                    lpcfg_realm(lp_ctx), "kadmin", NULL);
-
-                entry_ex->entry.modified_by = (Event *) malloc(sizeof(Event));
+
+                ret = smb_krb5_make_principal(context,
+                                              &entry_ex->entry.created_by.principal,
+                                              lpcfg_realm(lp_ctx), "kadmin", NULL);
+                if (ret) {
+                        krb5_clear_error_message(context);
+                        goto out;
+                }
+
+                entry_ex->entry.modified_by = (struct sdb_event *) malloc(sizeof(struct sdb_event));
                 if (entry_ex->entry.modified_by == NULL) {
                         ret = ENOMEM;
@@ -648 +801 @@
                 entry_ex->entry.modified_by->time = ldb_msg_find_krb5time_ldap_time(msg, "whenChanged", 0);
                 /* use 'kadmin' for now (needed by mit_samba) */
-                krb5_make_principal(context,
-                                    &entry_ex->entry.modified_by->principal,
-                                    lpcfg_realm(lp_ctx), "kadmin", NULL);
+                ret = smb_krb5_make_principal(context,
+                                              &entry_ex->entry.modified_by->principal,
+                                              lpcfg_realm(lp_ctx), "kadmin", NULL);
+                if (ret) {
+                        krb5_clear_error_message(context);
+                        goto out;
+                }
         }
 
@@ -664 +821 @@
 
         if (rid == DOMAIN_RID_KRBTGT) {
+                char *realm = NULL;
+
                 entry_ex->entry.valid_end = NULL;
                 entry_ex->entry.pw_end = NULL;
@@ -669 +828 @@
                 entry_ex->entry.flags.invalid = 0;
                 entry_ex->entry.flags.server = 1;
+
+                realm = smb_krb5_principal_get_realm(context, principal);
+                if (realm == NULL) {
+                        ret = ENOMEM;
+                        goto out;
+                }
 
                 /* Don't mark all requests for the krbtgt/realm as
@@ -675 +840 @@
                  * Instead, only do it when request is for the kpasswd service */
                 if (ent_type == SAMBA_KDC_ENT_TYPE_SERVER
-                    && principal->name.name_string.len == 2
-                    && (strcmp(principal->name.name_string.val[0], "kadmin") == 0)
-                    && (strcmp(principal->name.name_string.val[1], "changepw") == 0)
-                    && lpcfg_is_my_domain_or_realm(lp_ctx, principal->realm)) {
+                    && krb5_princ_size(context, principal) == 2
+                    && (principal_comp_strcmp(context, principal, 0, "kadmin") == 0)
+                    && (principal_comp_strcmp(context, principal, 1, "changepw") == 0)
+                    && lpcfg_is_my_domain_or_realm(lp_ctx, realm)) {
                         entry_ex->entry.flags.change_pw = 1;
                 }
+
+                SAFE_FREE(realm);
+
                 entry_ex->entry.flags.client = 0;
                 entry_ex->entry.flags.forwardable = 1;
@@ -748 +916 @@
 
         if (ent_type == SAMBA_KDC_ENT_TYPE_SERVER) {
-                *entry_ex->entry.max_life = nt_time_to_unix(kdc_db_ctx->policy.service_tkt_lifetime);
+                *entry_ex->entry.max_life = kdc_db_ctx->policy.svc_tkt_lifetime;
         } else if (ent_type == SAMBA_KDC_ENT_TYPE_KRBTGT || ent_type == SAMBA_KDC_ENT_TYPE_CLIENT) {
-                *entry_ex->entry.max_life = nt_time_to_unix(kdc_db_ctx->policy.user_tkt_lifetime);
+                *entry_ex->entry.max_life = kdc_db_ctx->policy.usr_tkt_lifetime;
         } else {
-                *entry_ex->entry.max_life = MIN(nt_time_to_unix(kdc_db_ctx->policy.service_tkt_lifetime),
-                                               nt_time_to_unix(kdc_db_ctx->policy.user_tkt_lifetime));
+                *entry_ex->entry.max_life = MIN(kdc_db_ctx->policy.svc_tkt_lifetime,
+                                                kdc_db_ctx->policy.usr_tkt_lifetime);
         }
 
@@ -762 +930 @@
         }
 
-        *entry_ex->entry.max_renew = nt_time_to_unix(kdc_db_ctx->policy.user_tkt_renewaltime);
-
-        entry_ex->entry.generation = NULL;
+        *entry_ex->entry.max_renew = kdc_db_ctx->policy.renewal_lifetime;
 
         /* Get keys from the db */
@@ -771 +937 @@
                                            ent_type, entry_ex);
         if (ret) {
-                /* Could be bougus data in the entry, or out of memory */
+                /* Could be bogus data in the entry, or out of memory */
                 goto out;
         }
@@ -789 +955 @@
         }
         for (i=0; i < entry_ex->entry.etypes->len; i++) {
-                entry_ex->entry.etypes->val[i] = entry_ex->entry.keys.val[i].key.keytype;
+                entry_ex->entry.etypes->val[i] = KRB5_KEY_TYPE(&entry_ex->entry.keys.val[i].key);
         }
 
@@ -798 +964 @@
         if (ret != 0) {
                 /* This doesn't free ent itself, that is for the eventual caller to do */
-                hdb_free_entry(context, entry_ex);
+                sdb_free_entry(entry_ex);
+                ZERO_STRUCTP(entry_ex);
         } else {
                 talloc_steal(kdc_db_ctx, entry_ex->ctx);
@@ -808 +975 @@
 /*
  * Construct an hdb_entry from a directory entry.
+ * The kvno is what the remote client asked for
  */
 static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
@@ -814 +982 @@
                                                enum trust_direction direction,
                                                struct ldb_dn *realm_dn,
+                                               unsigned flags,
+                                               uint32_t kvno,
                                                struct ldb_message *msg,
-                                               hdb_entry_ex *entry_ex)
+                                               struct sdb_entry_ex *entry_ex)
 {
         struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
-        const char *dnsdomain;
-        const char *realm = lpcfg_realm(lp_ctx);
-        DATA_BLOB password_utf16;
-        struct samr_Password password_hash;
+        const char *our_realm = lpcfg_realm(lp_ctx);
+        const char *dnsdomain = NULL;
+        char *partner_realm = NULL;
+        const char *realm = NULL;
+        const char *krbtgt_realm = NULL;
+        DATA_BLOB password_utf16 = data_blob_null;
+        DATA_BLOB password_utf8 = data_blob_null;
+        struct samr_Password _password_hash;
+        const struct samr_Password *password_hash = NULL;
         const struct ldb_val *password_val;
         struct trustAuthInOutBlob password_blob;
         struct samba_kdc_entry *p;
-
+        bool use_previous = false;
+        uint32_t current_kvno;
+        uint32_t previous_kvno;
+        uint32_t num_keys = 0;
         enum ndr_err_code ndr_err;
         int ret, trust_direction_flags;
         unsigned int i;
+        struct AuthenticationInformationArray *auth_array;
+        struct timeval tv;
+        NTTIME an_hour_ago;
+        uint32_t *auth_kvno;
+        bool preferr_current = false;
+        uint32_t supported_enctypes = ENC_RC4_HMAC_MD5;
+
+        if (dsdb_functional_level(kdc_db_ctx->samdb) >= DS_DOMAIN_FUNCTION_2008) {
+                supported_enctypes = ldb_msg_find_attr_as_uint(msg,
+                                        "msDS-SupportedEncryptionTypes",
+                                        supported_enctypes);
+        }
+
+        trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection", 0);
+        if (!(trust_direction_flags & direction)) {
+                krb5_clear_error_message(context);
+                ret = SDB_ERR_NOENTRY;
+                goto out;
+        }
+
+        dnsdomain = ldb_msg_find_attr_as_string(msg, "trustPartner", NULL);
+        if (dnsdomain == NULL) {
+                krb5_clear_error_message(context);
+                ret = SDB_ERR_NOENTRY;
+                goto out;
+        }
+        partner_realm = strupper_talloc(mem_ctx, dnsdomain);
+        if (partner_realm == NULL) {
+                krb5_clear_error_message(context);
+                ret = ENOMEM;
+                goto out;
+        }
+
+        if (direction == INBOUND) {
+                realm = our_realm;
+                krbtgt_realm = partner_realm;
+
+                password_val = ldb_msg_find_ldb_val(msg, "trustAuthIncoming");
+        } else { /* OUTBOUND */
+                realm = partner_realm;
+                krbtgt_realm = our_realm;
+
+                password_val = ldb_msg_find_ldb_val(msg, "trustAuthOutgoing");
+        }
+
+        if (password_val == NULL) {
+                krb5_clear_error_message(context);
+                ret = SDB_ERR_NOENTRY;
+                goto out;
+        }
+
+        ndr_err = ndr_pull_struct_blob(password_val, mem_ctx, &password_blob,
+                                       (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
+        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                krb5_clear_error_message(context);
+                ret = EINVAL;
+                goto out;
+        }
 
         p = talloc(mem_ctx, struct samba_kdc_entry);
@@ -837 +1073 @@
 
         p->kdc_db_ctx = kdc_db_ctx;
-        p->entry_ex = entry_ex;
         p->realm_dn = realm_dn;
 
@@ -843 +1078 @@
 
         /* make sure we do not have bogus data in there */
-        memset(&entry_ex->entry, 0, sizeof(hdb_entry));
+        memset(&entry_ex->entry, 0, sizeof(struct sdb_entry));
 
         entry_ex->ctx = p;
-        entry_ex->free_entry = samba_kdc_free_entry;
 
         /* use 'whenCreated' */
         entry_ex->entry.created_by.time = ldb_msg_find_krb5time_ldap_time(msg, "whenCreated", 0);
         /* use 'kadmin' for now (needed by mit_samba) */
-        krb5_make_principal(context,
-                            &entry_ex->entry.created_by.principal,
-                            realm, "kadmin", NULL);
-
-        entry_ex->entry.valid_start = NULL;
-
-        trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection", 0);
-
-        if (direction == INBOUND) {
-                password_val = ldb_msg_find_ldb_val(msg, "trustAuthIncoming");
-
-        } else { /* OUTBOUND */
-                dnsdomain = ldb_msg_find_attr_as_string(msg, "trustPartner", NULL);
-                /* replace realm */
-                realm = strupper_talloc(mem_ctx, dnsdomain);
-                password_val = ldb_msg_find_ldb_val(msg, "trustAuthOutgoing");
-        }
-
-        if (!password_val || !(trust_direction_flags & direction)) {
-                ret = ENOENT;
-                goto out;
-        }
-
-        ndr_err = ndr_pull_struct_blob(password_val, mem_ctx, &password_blob,
-                                           (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                ret = EINVAL;
-                goto out;
-        }
-
-        entry_ex->entry.kvno = -1;
-        for (i=0; i < password_blob.count; i++) {
-                if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_VERSION) {
-                        entry_ex->entry.kvno = password_blob.current.array[i].AuthInfo.version.version;
-                }
-        }
-
-        for (i=0; i < password_blob.count; i++) {
-                if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_CLEAR) {
-                        password_utf16 = data_blob_const(password_blob.current.array[i].AuthInfo.clear.password,
-                                                         password_blob.current.array[i].AuthInfo.clear.size);
-                        /* In the future, generate all sorts of
-                         * hashes, but for now we can't safely convert
-                         * the random strings windows uses into
-                         * utf8 */
-
-                        /* but as it is utf16 already, we can get the NT password/arcfour-hmac-md5 key */
-                        mdfour(password_hash.hash, password_utf16.data, password_utf16.length);
-                        break;
-                } else if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_NT4OWF) {
-                        password_hash = password_blob.current.array[i].AuthInfo.nt4owf.password;
-                        break;
-                }
-        }
-
-        if (i < password_blob.count) {
-                Key key;
-                /* Must have found a cleartext or MD4 password */
-                entry_ex->entry.keys.val = calloc(1, sizeof(Key));
-
-                key.mkvno = 0;
-                key.salt = NULL; /* No salt for this enc type */
-
-                if (entry_ex->entry.keys.val == NULL) {
-                        ret = ENOMEM;
-                        goto out;
-                }
-
-                ret = krb5_keyblock_init(context,
-                                         ENCTYPE_ARCFOUR_HMAC,
-                                         password_hash.hash, sizeof(password_hash.hash),
-                                         &key.key);
-
-                entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
-                entry_ex->entry.keys.len++;
-        }
-
-        entry_ex->entry.principal = malloc(sizeof(*(entry_ex->entry.principal)));
-
-        ret = copy_Principal(principal, entry_ex->entry.principal);
+        ret = smb_krb5_make_principal(context,
+                                      &entry_ex->entry.created_by.principal,
+                                      realm, "kadmin", NULL);
         if (ret) {
                 krb5_clear_error_message(context);
@@ -936 +1093 @@
         }
 
-        /* While we have copied the client principal, tests
-         * show that Win2k3 returns the 'corrected' realm, not
-         * the client-specified realm.  This code attempts to
-         * replace the client principal's realm with the one
-         * we determine from our records */
-
-        krb5_principal_set_realm(context, entry_ex->entry.principal, realm);
-        entry_ex->entry.flags = int2HDBFlags(0);
+        /*
+         * We always need to generate the canonicalized principal
+         * with the values of our database.
+         */
+        ret = smb_krb5_make_principal(context, &entry_ex->entry.principal, realm,
+                                      "krbtgt", krbtgt_realm, NULL);
+        if (ret) {
+                krb5_clear_error_message(context);
+                goto out;
+        }
+        smb_krb5_principal_set_type(context, entry_ex->entry.principal,
+                                    KRB5_NT_SRV_INST);
+
+        entry_ex->entry.valid_start = NULL;
+
+        /* we need to work out if we are going to use the current or
+         * the previous password hash.
+         * We base this on the kvno the client passes in. If the kvno
+         * passed in is equal to the current kvno in our database then
+         * we use the current structure. If it is the current kvno-1,
+         * then we use the previous substrucure.
+         */
+
+        /*
+         * Windows preferrs the previous key for one hour.
+         */
+        tv = timeval_current();
+        if (tv.tv_sec > 3600) {
+                tv.tv_sec -= 3600;
+        }
+        an_hour_ago = timeval_to_nttime(&tv);
+
+        /* first work out the current kvno */
+        current_kvno = 0;
+        for (i=0; i < password_blob.count; i++) {
+                struct AuthenticationInformation *a =
+                        &password_blob.current.array[i];
+
+                if (a->LastUpdateTime <= an_hour_ago) {
+                        preferr_current = true;
+                }
+
+                if (a->AuthType == TRUST_AUTH_TYPE_VERSION) {
+                        current_kvno = a->AuthInfo.version.version;
+                }
+        }
+        if (current_kvno == 0) {
+                previous_kvno = 255;
+        } else {
+                previous_kvno = current_kvno - 1;
+        }
+        for (i=0; i < password_blob.count; i++) {
+                struct AuthenticationInformation *a =
+                        &password_blob.previous.array[i];
+
+                if (a->AuthType == TRUST_AUTH_TYPE_VERSION) {
+                        previous_kvno = a->AuthInfo.version.version;
+                }
+        }
+
+        /* work out whether we will use the previous or current
+           password */
+        if (password_blob.previous.count == 0) {
+                /* there is no previous password */
+                use_previous = false;
+        } else if (!(flags & SDB_F_KVNO_SPECIFIED)) {
+                /*
+                 * If not specified we use the lowest kvno
+                 * for the first hour after an update.
+                 */
+                if (preferr_current) {
+                        use_previous = false;
+                } else if (previous_kvno < current_kvno) {
+                        use_previous = true;
+                } else {
+                        use_previous = false;
+                }
+        } else if (kvno == current_kvno) {
+                /*
+                 * Exact match ...
+                 */
+                use_previous = false;
+        } else if (kvno == previous_kvno) {
+                /*
+                 * Exact match ...
+                 */
+                use_previous = true;
+        } else {
+                /*
+                 * Fallback to the current one for anything else
+                 */
+                use_previous = false;
+        }
+
+        if (use_previous) {
+                auth_array = &password_blob.previous;
+                auth_kvno = &previous_kvno;
+        } else {
+                auth_array = &password_blob.current;
+                auth_kvno = &current_kvno;
+        }
+
+        /* use the kvno the client specified, if available */
+        if (flags & SDB_F_KVNO_SPECIFIED) {
+                entry_ex->entry.kvno = kvno;
+        } else {
+                entry_ex->entry.kvno = *auth_kvno;
+        }
+
+        for (i=0; i < auth_array->count; i++) {
+                if (auth_array->array[i].AuthType == TRUST_AUTH_TYPE_CLEAR) {
+                        bool ok;
+
+                        password_utf16 = data_blob_const(auth_array->array[i].AuthInfo.clear.password,
+                                                         auth_array->array[i].AuthInfo.clear.size);
+                        if (password_utf16.length == 0) {
+                                break;
+                        }
+
+                        if (supported_enctypes & ENC_RC4_HMAC_MD5) {
+                                mdfour(_password_hash.hash, password_utf16.data, password_utf16.length);
+                                if (password_hash == NULL) {
+                                        num_keys += 1;
+                                }
+                                password_hash = &_password_hash;
+                        }
+
+                        if (!(supported_enctypes & (ENC_HMAC_SHA1_96_AES128|ENC_HMAC_SHA1_96_AES256))) {
+                                break;
+                        }
+
+                        ok = convert_string_talloc(mem_ctx,
+                                                   CH_UTF16MUNGED, CH_UTF8,
+                                                   password_utf16.data,
+                                                   password_utf16.length,
+                                                   (void *)&password_utf8.data,
+                                                   &password_utf8.length);
+                        if (!ok) {
+                                krb5_clear_error_message(context);
+                                ret = ENOMEM;
+                                goto out;
+                        }
+
+                        if (supported_enctypes & ENC_HMAC_SHA1_96_AES128) {
+                                num_keys += 1;
+                        }
+                        if (supported_enctypes & ENC_HMAC_SHA1_96_AES256) {
+                                num_keys += 1;
+                        }
+                        break;
+                } else if (auth_array->array[i].AuthType == TRUST_AUTH_TYPE_NT4OWF) {
+                        if (supported_enctypes & ENC_RC4_HMAC_MD5) {
+                                password_hash = &auth_array->array[i].AuthInfo.nt4owf.password;
+                                num_keys += 1;
+                        }
+                }
+        }
+
+        /* Must have found a cleartext or MD4 password */
+        if (num_keys == 0) {
+                DEBUG(1,(__location__ ": no usable key found\n"));
+                krb5_clear_error_message(context);
+                ret = SDB_ERR_NOENTRY;
+                goto out;
+        }
+
+        entry_ex->entry.keys.val = calloc(num_keys, sizeof(struct sdb_key));
+        if (entry_ex->entry.keys.val == NULL) {
+                krb5_clear_error_message(context);
+                ret = ENOMEM;
+                goto out;
+        }
+
+        if (password_utf8.length != 0) {
+                struct sdb_key key = {};
+                krb5_const_principal salt_principal = entry_ex->entry.principal;
+                krb5_data salt;
+                krb5_data cleartext_data;
+
+                cleartext_data.data = discard_const_p(char, password_utf8.data);
+                cleartext_data.length = password_utf8.length;
+
+                ret = smb_krb5_get_pw_salt(context,
+                                           salt_principal,
+                                           &salt);
+                if (ret != 0) {
+                        goto out;
+                }
+
+                if (supported_enctypes & ENC_HMAC_SHA1_96_AES256) {
+                        ret = smb_krb5_create_key_from_string(context,
+                                                              salt_principal,
+                                                              &salt,
+                                                              &cleartext_data,
+                                                              ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+                                                              &key.key);
+                        if (ret != 0) {
+                                kerberos_free_data_contents(context, &salt);
+                                goto out;
+                        }
+
+                        entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
+                        entry_ex->entry.keys.len++;
+                }
+
+                if (supported_enctypes & ENC_HMAC_SHA1_96_AES128) {
+                        ret = smb_krb5_create_key_from_string(context,
+                                                              salt_principal,
+                                                              &salt,
+                                                              &cleartext_data,
+                                                              ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+                                                              &key.key);
+                        if (ret != 0) {
+                                kerberos_free_data_contents(context, &salt);
+                                goto out;
+                        }
+
+                        entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
+                        entry_ex->entry.keys.len++;
+                }
+
+                kerberos_free_data_contents(context, &salt);
+        }
+
+        if (password_hash != NULL) {
+                struct sdb_key key = {};
+
+                ret = smb_krb5_keyblock_init_contents(context,
+                                                      ENCTYPE_ARCFOUR_HMAC,
+                                                      password_hash->hash,
+                                                      sizeof(password_hash->hash),
+                                                      &key.key);
+                if (ret != 0) {
+                        goto out;
+                }
+
+                entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
+                entry_ex->entry.keys.len++;
+        }
+
+        entry_ex->entry.flags = int2SDBFlags(0);
         entry_ex->entry.flags.immutable = 1;
         entry_ex->entry.flags.invalid = 0;
@@ -954 +1344 @@
 
         entry_ex->entry.max_renew = NULL;
-
-        entry_ex->entry.generation = NULL;
 
         entry_ex->entry.etypes = malloc(sizeof(*(entry_ex->entry.etypes)));
@@ -971 +1359 @@
         }
         for (i=0; i < entry_ex->entry.etypes->len; i++) {
-                entry_ex->entry.etypes->val[i] = entry_ex->entry.keys.val[i].key.keytype;
-        }
-
+                entry_ex->entry.etypes->val[i] = KRB5_KEY_TYPE(&entry_ex->entry.keys.val[i].key);
+        }
 
         p->msg = talloc_steal(p, msg);
 
 out:
+        TALLOC_FREE(partner_realm);
+
         if (ret != 0) {
                 /* This doesn't free ent itself, that is for the eventual caller to do */
-                hdb_free_entry(context, entry_ex);
+                sdb_free_entry(entry_ex);
         } else {
                 talloc_steal(kdc_db_ctx, entry_ex->ctx);
@@ -995 +1384 @@
                                         struct ldb_message **pmsg)
 {
-        int lret;
-        krb5_error_code ret;
-        char *filter = NULL;
+        NTSTATUS status;
         const char * const *attrs = trust_attrs;
 
-        struct ldb_result *res = NULL;
-        filter = talloc_asprintf(mem_ctx, "(&(objectClass=trustedDomain)(|(flatname=%s)(trustPartner=%s)))", realm, realm);
-
-        if (!filter) {
-                ret = ENOMEM;
-                krb5_set_error_message(context, ret, "talloc_asprintf: out of memory");
+        status = dsdb_trust_search_tdo(ldb_ctx, realm, realm,
+                                       attrs, mem_ctx, pmsg);
+        if (NT_STATUS_IS_OK(status)) {
+                return 0;
+        } else if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                return SDB_ERR_NOENTRY;
+        } else if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
+                int ret = ENOMEM;
+                krb5_set_error_message(context, ret, "get_sam_result_trust: out of memory");
                 return ret;
-        }
-
-        lret = ldb_search(ldb_ctx, mem_ctx, &res,
-                          ldb_get_default_basedn(ldb_ctx),
-                          LDB_SCOPE_SUBTREE, attrs, "%s", filter);
-        if (lret != LDB_SUCCESS) {
-                DEBUG(3, ("Failed to search for %s: %s\n", filter, ldb_errstring(ldb_ctx)));
-                return HDB_ERR_NOENTRY;
-        } else if (res->count == 0 || res->count > 1) {
-                DEBUG(3, ("Failed find a single entry for %s: got %d\n", filter, res->count));
-                talloc_free(res);
-                return HDB_ERR_NOENTRY;
-        }
-        talloc_steal(mem_ctx, res->msgs);
-        *pmsg = res->msgs[0];
-        talloc_free(res);
-        return 0;
+        } else {
+                int ret = EINVAL;
+                krb5_set_error_message(context, ret, "get_sam_result_trust: %s", nt_errstr(status));
+                return ret;
+        }
 }
 
@@ -1032 +1410 @@
                                                 const char **attrs,
                                                 struct ldb_dn **realm_dn,
-                                                struct ldb_message **msg) {
+                                                struct ldb_message **msg)
+{
         NTSTATUS nt_status;
-        char *principal_string;
-        krb5_error_code ret;
-
-        ret = krb5_unparse_name(context, principal, &principal_string);
-
-        if (ret != 0) {
-                return ret;
+        char *principal_string = NULL;
+
+        if (smb_krb5_principal_get_type(context, principal) == KRB5_NT_ENTERPRISE_PRINCIPAL) {
+                principal_string = smb_krb5_principal_get_comp_string(mem_ctx, context,
+                                                                      principal, 0);
+                if (principal_string == NULL) {
+                        return ENOMEM;
+                }
+        } else {
+                char *principal_string_m = NULL;
+                krb5_error_code ret;
+
+                ret = krb5_unparse_name(context, principal, &principal_string_m);
+                if (ret != 0) {
+                        return ret;
+                }
+
+                principal_string = talloc_strdup(mem_ctx, principal_string_m);
+                SAFE_FREE(principal_string_m);
+                if (principal_string == NULL) {
+                        return ENOMEM;
+                }
         }
 
@@ -1046 +1440 @@
                                               mem_ctx, principal_string, attrs,
                                               realm_dn, msg);
-        free(principal_string);
         if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
-                return HDB_ERR_NOENTRY;
+                krb5_principal fallback_principal = NULL;
+                unsigned int num_comp;
+                char *fallback_realm = NULL;
+                char *fallback_account = NULL;
+                krb5_error_code ret;
+
+                ret = krb5_parse_name(context, principal_string,
+                                      &fallback_principal);
+                TALLOC_FREE(principal_string);
+                if (ret != 0) {
+                        return ret;
+                }
+
+                num_comp = krb5_princ_size(context, fallback_principal);
+                fallback_realm = smb_krb5_principal_get_realm(context,
+                                                              fallback_principal);
+                if (fallback_realm == NULL) {
+                        krb5_free_principal(context, fallback_principal);
+                        return ENOMEM;
+                }
+
+                if (num_comp == 1) {
+                        size_t len;
+
+                        fallback_account = smb_krb5_principal_get_comp_string(mem_ctx,
+                                                context, fallback_principal, 0);
+                        if (fallback_account == NULL) {
+                                krb5_free_principal(context, fallback_principal);
+                                SAFE_FREE(fallback_realm);
+                                return ENOMEM;
+                        }
+
+                        len = strlen(fallback_account);
+                        if (len >= 2 && fallback_account[len - 1] == '$') {
+                                TALLOC_FREE(fallback_account);
+                        }
+                }
+                krb5_free_principal(context, fallback_principal);
+                fallback_principal = NULL;
+
+                if (fallback_account != NULL) {
+                        char *with_dollar;
+
+                        with_dollar = talloc_asprintf(mem_ctx, "%s$",
+                                                     fallback_account);
+                        if (with_dollar == NULL) {
+                                SAFE_FREE(fallback_realm);
+                                return ENOMEM;
+                        }
+                        TALLOC_FREE(fallback_account);
+
+                        ret = smb_krb5_make_principal(context,
+                                                      &fallback_principal,
+                                                      fallback_realm,
+                                                      with_dollar, NULL);
+                        TALLOC_FREE(with_dollar);
+                        if (ret != 0) {
+                                SAFE_FREE(fallback_realm);
+                                return ret;
+                        }
+                }
+                SAFE_FREE(fallback_realm);
+
+                if (fallback_principal != NULL) {
+                        char *fallback_string = NULL;
+
+                        ret = krb5_unparse_name(context,
+                                                fallback_principal,
+                                                &fallback_string);
+                        if (ret != 0) {
+                                krb5_free_principal(context, fallback_principal);
+                                return ret;
+                        }
+
+                        nt_status = sam_get_results_principal(kdc_db_ctx->samdb,
+                                                              mem_ctx,
+                                                              fallback_string,
+                                                              attrs,
+                                                              realm_dn, msg);
+                        SAFE_FREE(fallback_string);
+                }
+                krb5_free_principal(context, fallback_principal);
+                fallback_principal = NULL;
+        }
+        TALLOC_FREE(principal_string);
+
+        if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
+                return SDB_ERR_NOENTRY;
         } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_MEMORY)) {
                 return ENOMEM;
@@ -1055 +1535 @@
         }
 
-        return ret;
+        return 0;
 }
 
@@ -1063 +1543 @@
                                                krb5_const_principal principal,
                                                unsigned flags,
-                                               hdb_entry_ex *entry_ex) {
+                                               struct sdb_entry_ex *entry_ex) {
         struct ldb_dn *realm_dn;
         krb5_error_code ret;
@@ -1069 +1549 @@
 
         ret = samba_kdc_lookup_client(context, kdc_db_ctx,
-                                       mem_ctx, principal, user_attrs,
-                                       &realm_dn, &msg);
+                                      mem_ctx, principal, user_attrs,
+                                      &realm_dn, &msg);
         if (ret != 0) {
                 return ret;
@@ -1087 +1567 @@
                                               krb5_const_principal principal,
                                               unsigned flags,
-                                              uint32_t krbtgt_number,
-                                              hdb_entry_ex *entry_ex)
+                                              uint32_t kvno,
+                                              struct sdb_entry_ex *entry_ex)
 {
         struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
@@ -1094 +1574 @@
         struct ldb_message *msg = NULL;
         struct ldb_dn *realm_dn = ldb_get_default_basedn(kdc_db_ctx->samdb);
-
-        krb5_principal alloc_principal = NULL;
-        if (principal->name.name_string.len != 2
-            || (strcmp(principal->name.name_string.val[0], KRB5_TGS_NAME) != 0)) {
+        char *realm_from_princ, *realm_from_princ_malloc;
+        char *realm_princ_comp = smb_krb5_principal_get_comp_string(mem_ctx, context, principal, 1);
+
+        realm_from_princ_malloc = smb_krb5_principal_get_realm(context, principal);
+        if (realm_from_princ_malloc == NULL) {
+                /* can't happen */
+                return SDB_ERR_NOENTRY;
+        }
+        realm_from_princ = talloc_strdup(mem_ctx, realm_from_princ_malloc);
+        free(realm_from_princ_malloc);
+        if (realm_from_princ == NULL) {
+                return SDB_ERR_NOENTRY;
+        }
+
+        if (krb5_princ_size(context, principal) != 2
+            || (principal_comp_strcmp(context, principal, 0, KRB5_TGS_NAME) != 0)) {
                 /* Not a krbtgt */
-                return HDB_ERR_NOENTRY;
+                return SDB_ERR_NOENTRY;
         }
 
         /* krbtgt case.  Either us or a trusted realm */
 
-        if (lpcfg_is_my_domain_or_realm(lp_ctx, principal->realm)
-            && lpcfg_is_my_domain_or_realm(lp_ctx, principal->name.name_string.val[1])) {
+        if (lpcfg_is_my_domain_or_realm(lp_ctx, realm_from_princ)
+            && lpcfg_is_my_domain_or_realm(lp_ctx, realm_princ_comp)) {
                 /* us, or someone quite like us */
                 /* Cludge, cludge cludge.  If the realm part of krbtgt/realm,
@@ -1112 +1604 @@
 
                 int lret;
+                unsigned int krbtgt_number;
+                /* w2k8r2 sometimes gives us a kvno of 255 for inter-domain
+                   trust tickets. We don't yet know what this means, but we do
+                   seem to need to treat it as unspecified */
+                if (flags & SDB_F_KVNO_SPECIFIED) {
+                        krbtgt_number = SAMBA_KVNO_GET_KRBTGT(kvno);
+                        if (kdc_db_ctx->rodc) {
+                                if (krbtgt_number != kdc_db_ctx->my_krbtgt_number) {
+                                        return SDB_ERR_NOT_FOUND_HERE;
+                                }
+                        }
+                } else {
+                        krbtgt_number = kdc_db_ctx->my_krbtgt_number;
+                }
 
                 if (krbtgt_number == kdc_db_ctx->my_krbtgt_number) {
                         lret = dsdb_search_one(kdc_db_ctx->samdb, mem_ctx,
                                                &msg, kdc_db_ctx->krbtgt_dn, LDB_SCOPE_BASE,
-                                               krbtgt_attrs, 0,
+                                               krbtgt_attrs, DSDB_SEARCH_NO_GLOBAL_CATALOG,
                                                "(objectClass=user)");
                 } else {
@@ -1125 +1631 @@
                                                &msg, realm_dn, LDB_SCOPE_SUBTREE,
                                                krbtgt_attrs,
-                                               DSDB_SEARCH_SHOW_EXTENDED_DN,
+                                               DSDB_SEARCH_SHOW_EXTENDED_DN | DSDB_SEARCH_NO_GLOBAL_CATALOG,
                                                "(&(objectClass=user)(msDS-SecondaryKrbTgtNumber=%u))", (unsigned)(krbtgt_number));
                 }
@@ -1132 +1638 @@
                         krb5_warnx(context, "samba_kdc_fetch: could not find KRBTGT number %u in DB!",
                                    (unsigned)(krbtgt_number));
-                        krb5_set_error_message(context, HDB_ERR_NOENTRY,
+                        krb5_set_error_message(context, SDB_ERR_NOENTRY,
                                                "samba_kdc_fetch: could not find KRBTGT number %u in DB!",
                                                (unsigned)(krbtgt_number));
-                        return HDB_ERR_NOENTRY;
+                        return SDB_ERR_NOENTRY;
                 } else if (lret != LDB_SUCCESS) {
                         krb5_warnx(context, "samba_kdc_fetch: could not find KRBTGT number %u in DB!",
                                    (unsigned)(krbtgt_number));
-                        krb5_set_error_message(context, HDB_ERR_NOENTRY,
+                        krb5_set_error_message(context, SDB_ERR_NOENTRY,
                                                "samba_kdc_fetch: could not find KRBTGT number %u in DB!",
                                                (unsigned)(krbtgt_number));
-                        return HDB_ERR_NOENTRY;
-                }
-
-                if (flags & HDB_F_CANON) {
-                        ret = krb5_copy_principal(context, principal, &alloc_principal);
-                        if (ret) {
-                                return ret;
-                        }
-
-                        /* When requested to do so, ensure that the
-                         * both realm values in the principal are set
-                         * to the upper case, canonical realm */
-                        free(alloc_principal->name.name_string.val[1]);
-                        alloc_principal->name.name_string.val[1] = strdup(lpcfg_realm(lp_ctx));
-                        if (!alloc_principal->name.name_string.val[1]) {
-                                ret = ENOMEM;
-                                krb5_set_error_message(context, ret, "samba_kdc_fetch: strdup() failed!");
-                                return ret;
-                        }
-                        principal = alloc_principal;
+                        return SDB_ERR_NOENTRY;
                 }
 
@@ -1167 +1654 @@
                                               principal, SAMBA_KDC_ENT_TYPE_KRBTGT,
                                               flags, realm_dn, msg, entry_ex);
-                if (flags & HDB_F_CANON) {
-                        /* This is again copied in the message2entry call */
-                        krb5_free_principal(context, alloc_principal);
-                }
                 if (ret != 0) {
                         krb5_warnx(context, "samba_kdc_fetch: self krbtgt message2entry failed");
@@ -1182 +1665 @@
                 /* Either an inbound or outbound trust */
 
-                if (strcasecmp(lpcfg_realm(lp_ctx), principal->realm) == 0) {
+                if (strcasecmp(lpcfg_realm(lp_ctx), realm_from_princ) == 0) {
                         /* look for inbound trust */
                         direction = INBOUND;
-                        realm = principal->name.name_string.val[1];
-                } else if (strcasecmp(lpcfg_realm(lp_ctx), principal->name.name_string.val[1]) == 0) {
+                        realm = realm_princ_comp;
+                } else if (principal_comp_strcasecmp(context, principal, 1, lpcfg_realm(lp_ctx)) == 0) {
                         /* look for outbound trust */
                         direction = OUTBOUND;
-                        realm = principal->realm;
+                        realm = realm_from_princ;
                 } else {
                         krb5_warnx(context, "samba_kdc_fetch: not our realm for trusts ('%s', '%s')",
-                                   principal->realm, principal->name.name_string.val[1]);
-                        krb5_set_error_message(context, HDB_ERR_NOENTRY, "samba_kdc_fetch: not our realm for trusts ('%s', '%s')",
-                                               principal->realm, principal->name.name_string.val[1]);
-                        return HDB_ERR_NOENTRY;
+                                   realm_from_princ,
+                                   realm_princ_comp);
+                        krb5_set_error_message(context, SDB_ERR_NOENTRY, "samba_kdc_fetch: not our realm for trusts ('%s', '%s')",
+                                               realm_from_princ,
+                                               realm_princ_comp);
+                        return SDB_ERR_NOENTRY;
                 }
 
@@ -1211 +1696 @@
 
                 ret = samba_kdc_trust_message2entry(context, kdc_db_ctx, mem_ctx,
-                                              principal, direction,
-                                              realm_dn, msg, entry_ex);
+                                                    principal, direction,
+                                                    realm_dn, flags, kvno, msg, entry_ex);
                 if (ret != 0) {
-                        krb5_warnx(context, "samba_kdc_fetch: trust_message2entry failed");
+                        krb5_warnx(context, "samba_kdc_fetch: trust_message2entry failed for %s",
+                                   ldb_dn_get_linearized(msg->dn));
+                        krb5_set_error_message(context, ret, "samba_kdc_fetch: "
+                                               "trust_message2entry failed for %s",
+                                               ldb_dn_get_linearized(msg->dn));
                 }
                 return ret;
@@ -1222 +1711 @@
 
 static krb5_error_code samba_kdc_lookup_server(krb5_context context,
-                                                struct samba_kdc_db_context *kdc_db_ctx,
-                                                TALLOC_CTX *mem_ctx,
-                                                krb5_const_principal principal,
-                                                const char **attrs,
-                                                struct ldb_dn **realm_dn,
-                                                struct ldb_message **msg)
+                                               struct samba_kdc_db_context *kdc_db_ctx,
+                                               TALLOC_CTX *mem_ctx,
+                                               krb5_const_principal principal,
+                                               unsigned flags,
+                                               const char **attrs,
+                                               struct ldb_dn **realm_dn,
+                                               struct ldb_message **msg)
 {
         krb5_error_code ret;
-        if (principal->name.name_string.len >= 2) {
+        if ((smb_krb5_principal_get_type(context, principal) != KRB5_NT_ENTERPRISE_PRINCIPAL)
+            && krb5_princ_size(context, principal) >= 2) {
                 /* 'normal server' case */
                 int ldb_ret;
@@ -1253 +1744 @@
 
                 if (!NT_STATUS_IS_OK(nt_status)) {
-                        return HDB_ERR_NOENTRY;
+                        return SDB_ERR_NOENTRY;
                 }
 
@@ -1259 +1750 @@
                                           mem_ctx,
                                           msg, user_dn, LDB_SCOPE_BASE,
-                                          attrs, DSDB_SEARCH_SHOW_EXTENDED_DN, "(objectClass=*)");
+                                          attrs,
+                                          DSDB_SEARCH_SHOW_EXTENDED_DN | DSDB_SEARCH_NO_GLOBAL_CATALOG,
+                                          "(objectClass=*)");
                 if (ldb_ret != LDB_SUCCESS) {
-                        return HDB_ERR_NOENTRY;
-                }
-
+                        return SDB_ERR_NOENTRY;
+                }
+                return 0;
+        } else if (!(flags & SDB_F_FOR_AS_REQ)
+                   && smb_krb5_principal_get_type(context, principal) == KRB5_NT_ENTERPRISE_PRINCIPAL) {
+                /*
+                 * The behaviour of accepting an
+                 * KRB5_NT_ENTERPRISE_PRINCIPAL server principal
+                 * containing a UPN only applies to TGS-REQ packets,
+                 * not AS-REQ packets.
+                 */
+                return samba_kdc_lookup_client(context, kdc_db_ctx,
+                                               mem_ctx, principal, attrs,
+                                               realm_dn, msg);
         } else {
+                /*
+                 * This case is for:
+                 *  - the AS-REQ, where we only accept
+                 *    samAccountName based lookups for the server, no
+                 *    matter if the name is an
+                 *    KRB5_NT_ENTERPRISE_PRINCIPAL or not
+                 *  - for the TGS-REQ when we are not given an
+                 *    KRB5_NT_ENTERPRISE_PRINCIPAL, which also must
+                 *    only lookup samAccountName based names.
+                 */
                 int lret;
+                char *short_princ;
+                krb5_principal enterprise_principal = NULL;
+                krb5_const_principal used_principal = NULL;
+                char *name1 = NULL;
+                size_t len1 = 0;
                 char *filter = NULL;
-                char *short_princ;
-                const char *realm;
+
+                if (smb_krb5_principal_get_type(context, principal) == KRB5_NT_ENTERPRISE_PRINCIPAL) {
+                        char *str = NULL;
+                        /* Need to reparse the enterprise principal to find the real target */
+                        if (krb5_princ_size(context, principal) != 1) {
+                                ret = KRB5_PARSE_MALFORMED;
+                                krb5_set_error_message(context, ret, "samba_kdc_lookup_server: request for an "
+                                                       "enterprise principal with wrong (%d) number of components",
+                                                       krb5_princ_size(context, principal));
+                                return ret;
+                        }
+                        str = smb_krb5_principal_get_comp_string(mem_ctx, context, principal, 0);
+                        if (str == NULL) {
+                                return KRB5_PARSE_MALFORMED;
+                        }
+                        ret = krb5_parse_name(context, str,
+                                              &enterprise_principal);
+                        talloc_free(str);
+                        if (ret) {
+                                return ret;
+                        }
+                        used_principal = enterprise_principal;
+                } else {
+                        used_principal = principal;
+                }
+
                 /* server as client principal case, but we must not lookup userPrincipalNames */
                 *realm_dn = ldb_get_default_basedn(kdc_db_ctx->samdb);
-                realm = krb5_principal_get_realm(context, principal);
-
-                /* TODO: Check if it is our realm, otherwise give referall */
-
-                ret = krb5_unparse_name_flags(context, principal,  KRB5_PRINCIPAL_UNPARSE_NO_REALM, &short_princ);
+
+                /* TODO: Check if it is our realm, otherwise give referral */
+
+                ret = krb5_unparse_name_flags(context, used_principal,
+                                              KRB5_PRINCIPAL_UNPARSE_NO_REALM |
+                                              KRB5_PRINCIPAL_UNPARSE_DISPLAY,
+                                              &short_princ);
+                used_principal = NULL;
+                krb5_free_principal(context, enterprise_principal);
+                enterprise_principal = NULL;
 
                 if (ret != 0) {
@@ -1283 +1831 @@
                 }
 
+                name1 = ldb_binary_encode_string(mem_ctx, short_princ);
+                SAFE_FREE(short_princ);
+                if (name1 == NULL) {
+                        return ENOMEM;
+                }
+                len1 = strlen(name1);
+                if (len1 >= 1 && name1[len1 - 1] != '$') {
+                        filter = talloc_asprintf(mem_ctx,
+                                        "(&(objectClass=user)(|(samAccountName=%s)(samAccountName=%s$)))",
+                                        name1, name1);
+                        if (filter == NULL) {
+                                return ENOMEM;
+                        }
+                } else {
+                        filter = talloc_asprintf(mem_ctx,
+                                        "(&(objectClass=user)(samAccountName=%s))",
+                                        name1);
+                        if (filter == NULL) {
+                                return ENOMEM;
+                        }
+                }
+
                 lret = dsdb_search_one(kdc_db_ctx->samdb, mem_ctx, msg,
                                        *realm_dn, LDB_SCOPE_SUBTREE,
                                        attrs,
-                                       DSDB_SEARCH_SHOW_EXTENDED_DN,
-                                       "(&(objectClass=user)(samAccountName=%s))",
-                                       ldb_binary_encode_string(mem_ctx, short_princ));
-                free(short_princ);
+                                       DSDB_SEARCH_SHOW_EXTENDED_DN | DSDB_SEARCH_NO_GLOBAL_CATALOG,
+                                       "%s", filter);
                 if (lret == LDB_ERR_NO_SUCH_OBJECT) {
-                        DEBUG(3, ("Failed find a entry for %s\n", filter));
-                        return HDB_ERR_NOENTRY;
+                        DEBUG(10, ("Failed to find an entry for %s filter:%s\n",
+                                  name1, filter));
+                        return SDB_ERR_NOENTRY;
+                }
+                if (lret == LDB_ERR_CONSTRAINT_VIOLATION) {
+                        DEBUG(10, ("Failed to find unique entry for %s filter:%s\n",
+                                  name1, filter));
+                        return SDB_ERR_NOENTRY;
                 }
                 if (lret != LDB_SUCCESS) {
-                        DEBUG(3, ("Failed single search for for %s - %s\n",
-                                  filter, ldb_errstring(kdc_db_ctx->samdb)));
-                        return HDB_ERR_NOENTRY;
-                }
-        }
-
-        return 0;
+                        DEBUG(0, ("Failed single search for %s - %s\n",
+                                  name1, ldb_errstring(kdc_db_ctx->samdb)));
+                        return SDB_ERR_NOENTRY;
+                }
+                return 0;
+        }
+        return SDB_ERR_NOENTRY;
 }
+
+
 
 static krb5_error_code samba_kdc_fetch_server(krb5_context context,
@@ -1309 +1885 @@
                                               krb5_const_principal principal,
                                               unsigned flags,
-                                              hdb_entry_ex *entry_ex)
+                                              struct sdb_entry_ex *entry_ex)
 {
         krb5_error_code ret;
@@ -1316 +1892 @@
 
         ret = samba_kdc_lookup_server(context, kdc_db_ctx, mem_ctx, principal,
-                                       server_attrs, &realm_dn, &msg);
+                                      flags, server_attrs, &realm_dn, &msg);
         if (ret != 0) {
                 return ret;
@@ -1332 +1908 @@
 }
 
+static krb5_error_code samba_kdc_lookup_realm(krb5_context context,
+                                              struct samba_kdc_db_context *kdc_db_ctx,
+                                              TALLOC_CTX *mem_ctx,
+                                              krb5_const_principal principal,
+                                              unsigned flags,
+                                              struct sdb_entry_ex *entry_ex)
+{
+        TALLOC_CTX *frame = talloc_stackframe();
+        NTSTATUS status;
+        krb5_error_code ret;
+        char *_realm = NULL;
+        bool check_realm = false;
+        const char *realm = NULL;
+        struct dsdb_trust_routing_table *trt = NULL;
+        const struct lsa_TrustDomainInfoInfoEx *tdo = NULL;
+        unsigned int num_comp;
+        bool ok;
+        char *upper = NULL;
+
+        num_comp = krb5_princ_size(context, principal);
+
+        if (flags & SDB_F_GET_CLIENT) {
+                if (flags & SDB_F_FOR_AS_REQ) {
+                        check_realm = true;
+                }
+        }
+        if (flags & SDB_F_GET_SERVER) {
+                if (flags & SDB_F_FOR_TGS_REQ) {
+                        check_realm = true;
+                }
+        }
+
+        if (!check_realm) {
+                TALLOC_FREE(frame);
+                return 0;
+        }
+
+        _realm = smb_krb5_principal_get_realm(context, principal);
+        if (_realm == NULL) {
+                TALLOC_FREE(frame);
+                return ENOMEM;
+        }
+
+        /*
+         * The requested realm needs to be our own
+         */
+        ok = lpcfg_is_my_domain_or_realm(kdc_db_ctx->lp_ctx, _realm);
+        if (!ok) {
+                /*
+                 * The request is not for us...
+                 */
+                SAFE_FREE(_realm);
+                TALLOC_FREE(frame);
+                return SDB_ERR_NOENTRY;
+        }
+
+        realm = talloc_strdup(frame, _realm);
+        SAFE_FREE(_realm);
+        if (realm == NULL) {
+                TALLOC_FREE(frame);
+                return ENOMEM;
+        }
+
+        if (smb_krb5_principal_get_type(context, principal) == KRB5_NT_ENTERPRISE_PRINCIPAL) {
+                char *principal_string = NULL;
+                krb5_principal enterprise_principal = NULL;
+                char *enterprise_realm = NULL;
+
+                if (num_comp != 1) {
+                        TALLOC_FREE(frame);
+                        return SDB_ERR_NOENTRY;
+                }
+
+                principal_string = smb_krb5_principal_get_comp_string(frame, context,
+                                                                      principal, 0);
+                if (principal_string == NULL) {
+                        TALLOC_FREE(frame);
+                        return ENOMEM;
+                }
+
+                ret = krb5_parse_name(context, principal_string,
+                                      &enterprise_principal);
+                TALLOC_FREE(principal_string);
+                if (ret) {
+                        TALLOC_FREE(frame);
+                        return ret;
+                }
+
+                enterprise_realm = smb_krb5_principal_get_realm(context,
+                                                        enterprise_principal);
+                krb5_free_principal(context, enterprise_principal);
+                if (enterprise_realm != NULL) {
+                        realm = talloc_strdup(frame, enterprise_realm);
+                        SAFE_FREE(enterprise_realm);
+                        if (realm == NULL) {
+                                TALLOC_FREE(frame);
+                                return ENOMEM;
+                        }
+                }
+        }
+
+        if (flags & SDB_F_GET_SERVER) {
+                char *service_realm = NULL;
+
+                ret = principal_comp_strcmp(context, principal, 0, KRB5_TGS_NAME);
+                if (ret == 0) {
+                        /*
+                         * we need to search krbtgt/ locally
+                         */
+                        TALLOC_FREE(frame);
+                        return 0;
+                }
+
+                /*
+                 * We need to check the last component against the routing table.
+                 *
+                 * Note this works only with 2 or 3 component principals, e.g:
+                 *
+                 * servicePrincipalName: ldap/W2K8R2-219.bla.base
+                 * servicePrincipalName: ldap/W2K8R2-219.bla.base/bla.base
+                 * servicePrincipalName: ldap/W2K8R2-219.bla.base/ForestDnsZones.bla.base
+                 * servicePrincipalName: ldap/W2K8R2-219.bla.base/DomainDnsZones.bla.base
+                 */
+
+                if (num_comp == 2 || num_comp == 3) {
+                        service_realm = smb_krb5_principal_get_comp_string(frame,
+                                                                           context,
+                                                                           principal,
+                                                                           num_comp - 1);
+                }
+
+                if (service_realm != NULL) {
+                        realm = service_realm;
+                }
+        }
+
+        ok = lpcfg_is_my_domain_or_realm(kdc_db_ctx->lp_ctx, realm);
+        if (ok) {
+                /*
+                 * skip the expensive routing lookup
+                 */
+                TALLOC_FREE(frame);
+                return 0;
+        }
+
+        status = dsdb_trust_routing_table_load(kdc_db_ctx->samdb,
+                                               frame, &trt);
+        if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(frame);
+                return EINVAL;
+        }
+
+        tdo = dsdb_trust_routing_by_name(trt, realm);
+        if (tdo == NULL) {
+                /*
+                 * This principal has to be local
+                 */
+                TALLOC_FREE(frame);
+                return 0;
+        }
+
+        if (tdo->trust_attributes & LSA_TRUST_ATTRIBUTE_WITHIN_FOREST) {
+                /*
+                 * TODO: handle the routing within the forest
+                 *
+                 * This should likely be handled in
+                 * samba_kdc_message2entry() in case we're
+                 * a global catalog. We'd need to check
+                 * if realm_dn is our own domain and derive
+                 * the dns domain name from realm_dn and check that
+                 * against the routing table or fallback to
+                 * the tdo we found here.
+                 *
+                 * But for now we don't support multiple domains
+                 * in our forest correctly anyway.
+                 *
+                 * Just search in our local database.
+                 */
+                TALLOC_FREE(frame);
+                return 0;
+        }
+
+        ZERO_STRUCT(entry_ex->entry);
+
+        ret = krb5_copy_principal(context, principal,
+                                  &entry_ex->entry.principal);
+        if (ret) {
+                TALLOC_FREE(frame);
+                return ret;
+        }
+
+        upper = strupper_talloc(frame, tdo->domain_name.string);
+        if (upper == NULL) {
+                TALLOC_FREE(frame);
+                return ENOMEM;
+        }
+
+        ret = smb_krb5_principal_set_realm(context,
+                                           entry_ex->entry.principal,
+                                           upper);
+        if (ret) {
+                TALLOC_FREE(frame);
+                return ret;
+        }
+
+        TALLOC_FREE(frame);
+        return SDB_ERR_WRONG_REALM;
+}
+
 krb5_error_code samba_kdc_fetch(krb5_context context,
                                 struct samba_kdc_db_context *kdc_db_ctx,
@@ -1337 +2122 @@
                                 unsigned flags,
                                 krb5_kvno kvno,
-                                hdb_entry_ex *entry_ex)
+                                struct sdb_entry_ex *entry_ex)
 {
-        krb5_error_code ret = HDB_ERR_NOENTRY;
+        krb5_error_code ret = SDB_ERR_NOENTRY;
         TALLOC_CTX *mem_ctx;
-        unsigned int krbtgt_number;
-        if (flags & HDB_F_KVNO_SPECIFIED) {
-                krbtgt_number = SAMBA_KVNO_GET_KRBTGT(kvno);
-                if (kdc_db_ctx->rodc) {
-                        if (krbtgt_number != kdc_db_ctx->my_krbtgt_number) {
-                                return HDB_ERR_NOT_FOUND_HERE;
-                        }
-                }
-        } else {
-                krbtgt_number = kdc_db_ctx->my_krbtgt_number;
-        }
 
         mem_ctx = talloc_named(kdc_db_ctx, 0, "samba_kdc_fetch context");
@@ -1360 +2134 @@
         }
 
-        if (flags & HDB_F_GET_CLIENT) {
+        ret = samba_kdc_lookup_realm(context, kdc_db_ctx, mem_ctx,
+                                     principal, flags, entry_ex);
+        if (ret != 0) {
+                goto done;
+        }
+
+        ret = SDB_ERR_NOENTRY;
+
+        if (flags & SDB_F_GET_CLIENT) {
                 ret = samba_kdc_fetch_client(context, kdc_db_ctx, mem_ctx, principal, flags, entry_ex);
-                if (ret != HDB_ERR_NOENTRY) goto done;
-        }
-        if (flags & HDB_F_GET_SERVER) {
+                if (ret != SDB_ERR_NOENTRY) goto done;
+        }
+        if (flags & SDB_F_GET_SERVER) {
                 /* krbtgt fits into this situation for trusted realms, and for resolving different versions of our own realm name */
-                ret = samba_kdc_fetch_krbtgt(context, kdc_db_ctx, mem_ctx, principal, flags, krbtgt_number, entry_ex);
-                if (ret != HDB_ERR_NOENTRY) goto done;
+                ret = samba_kdc_fetch_krbtgt(context, kdc_db_ctx, mem_ctx, principal, flags, kvno, entry_ex);
+                if (ret != SDB_ERR_NOENTRY) goto done;
 
                 /* We return 'no entry' if it does not start with krbtgt/, so move to the common case quickly */
                 ret = samba_kdc_fetch_server(context, kdc_db_ctx, mem_ctx, principal, flags, entry_ex);
-                if (ret != HDB_ERR_NOENTRY) goto done;
-        }
-        if (flags & HDB_F_GET_KRBTGT) {
-                ret = samba_kdc_fetch_krbtgt(context, kdc_db_ctx, mem_ctx, principal, flags, krbtgt_number, entry_ex);
-                if (ret != HDB_ERR_NOENTRY) goto done;
+                if (ret != SDB_ERR_NOENTRY) goto done;
+        }
+        if (flags & SDB_F_GET_KRBTGT) {
+                ret = samba_kdc_fetch_krbtgt(context, kdc_db_ctx, mem_ctx, principal, flags, kvno, entry_ex);
+                if (ret != SDB_ERR_NOENTRY) goto done;
         }
 
@@ -1392 +2174 @@
 static krb5_error_code samba_kdc_seq(krb5_context context,
                                      struct samba_kdc_db_context *kdc_db_ctx,
-                                     hdb_entry_ex *entry)
+                                     struct sdb_entry_ex *entry)
 {
         krb5_error_code ret;
         struct samba_kdc_seq *priv = kdc_db_ctx->seq_ctx;
+        const char *realm = lpcfg_realm(kdc_db_ctx->lp_ctx);
+        struct ldb_message *msg = NULL;
+        const char *sAMAccountName = NULL;
+        krb5_principal principal = NULL;
         TALLOC_CTX *mem_ctx;
-        hdb_entry_ex entry_ex;
-        memset(&entry_ex, '\0', sizeof(entry_ex));
 
         if (!priv) {
-                return HDB_ERR_NOENTRY;
+                return SDB_ERR_NOENTRY;
         }
 
@@ -1412 +2196 @@
         }
 
-        if (priv->index < priv->count) {
-                ret = samba_kdc_message2entry(context, kdc_db_ctx, mem_ctx,
-                                              NULL, SAMBA_KDC_ENT_TYPE_ANY,
-                                              HDB_F_ADMIN_DATA|HDB_F_GET_ANY,
-                                              priv->realm_dn, priv->msgs[priv->index++], entry);
-        } else {
-                ret = HDB_ERR_NOENTRY;
+        while (priv->index < priv->count) {
+                msg = priv->msgs[priv->index++];
+
+                sAMAccountName = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
+                if (sAMAccountName != NULL) {
+                        break;
+                }
+        }
+
+        if (sAMAccountName == NULL) {
+                ret = SDB_ERR_NOENTRY;
+                goto out;
+        }
+
+        ret = smb_krb5_make_principal(context, &principal,
+                                      realm, sAMAccountName, NULL);
+        if (ret != 0) {
+                goto out;
+        }
+
+        ret = samba_kdc_message2entry(context, kdc_db_ctx, mem_ctx,
+                                      principal, SAMBA_KDC_ENT_TYPE_ANY,
+                                      SDB_F_ADMIN_DATA|SDB_F_GET_ANY,
+                                      priv->realm_dn, msg, entry);
+
+out:
+        if (principal != NULL) {
+                krb5_free_principal(context, principal);
         }
 
@@ -1433 +2238 @@
 krb5_error_code samba_kdc_firstkey(krb5_context context,
                                    struct samba_kdc_db_context *kdc_db_ctx,
-                                   hdb_entry_ex *entry)
+                                   struct sdb_entry_ex *entry)
 {
         struct ldb_context *ldb_ctx = kdc_db_ctx->samdb;
@@ -1473 +2278 @@
                 return ret;
         }
-
-        lret = ldb_search(ldb_ctx, priv, &res,
-                          priv->realm_dn, LDB_SCOPE_SUBTREE, user_attrs,
-                          "(objectClass=user)");
+        krb5_free_default_realm(context, realm);
+
+        lret = dsdb_search(ldb_ctx, priv, &res,
+                           priv->realm_dn, LDB_SCOPE_SUBTREE, user_attrs,
+                           DSDB_SEARCH_NO_GLOBAL_CATALOG,
+                           "(objectClass=user)");
 
         if (lret != LDB_SUCCESS) {
                 TALLOC_FREE(priv);
-                return HDB_ERR_NOENTRY;
+                return SDB_ERR_NOENTRY;
         }
 
@@ -1502 +2309 @@
 krb5_error_code samba_kdc_nextkey(krb5_context context,
                                   struct samba_kdc_db_context *kdc_db_ctx,
-                                  hdb_entry_ex *entry)
+                                  struct sdb_entry_ex *entry)
 {
         return samba_kdc_seq(context, kdc_db_ctx, entry);
@@ -1510 +2317 @@
  *
  * This is currently a very nasty hack - allowing only delegation to itself.
- *
- * This is shared between the constrained delegation and S4U2Self code.
  */
 krb5_error_code
-samba_kdc_check_identical_client_and_server(krb5_context context,
-                                            struct samba_kdc_db_context *kdc_db_ctx,
-                                            hdb_entry_ex *entry,
-                                            krb5_const_principal target_principal)
+samba_kdc_check_s4u2self(krb5_context context,
+                         struct samba_kdc_db_context *kdc_db_ctx,
+                         struct samba_kdc_entry *skdc_entry,
+                         krb5_const_principal target_principal)
 {
         krb5_error_code ret;
-        krb5_principal enterprise_prinicpal = NULL;
         struct ldb_dn *realm_dn;
         struct ldb_message *msg;
         struct dom_sid *orig_sid;
         struct dom_sid *target_sid;
-        struct samba_kdc_entry *p = talloc_get_type(entry->ctx, struct samba_kdc_entry);
         const char *delegation_check_attrs[] = {
                 "objectSid", NULL
         };
 
-        TALLOC_CTX *mem_ctx = talloc_named(kdc_db_ctx, 0, "samba_kdc_check_constrained_delegation");
+        TALLOC_CTX *mem_ctx = talloc_named(kdc_db_ctx, 0, "samba_kdc_check_s4u2self");
 
         if (!mem_ctx) {
                 ret = ENOMEM;
-                krb5_set_error_message(context, ret, "samba_kdc_fetch: talloc_named() failed!");
+                krb5_set_error_message(context, ret, "samba_kdc_check_s4u2self: talloc_named() failed!");
                 return ret;
         }
 
-        if (target_principal->name.name_type == KRB5_NT_ENTERPRISE_PRINCIPAL) {
-                /* Need to reparse the enterprise principal to find the real target */
-                if (target_principal->name.name_string.len != 1) {
-                        ret = KRB5_PARSE_MALFORMED;
-                        krb5_set_error_message(context, ret, "samba_kdc_check_constrained_delegation: request for delegation to enterprise principal with wrong (%d) number of components",
-                                               target_principal->name.name_string.len);
-                        talloc_free(mem_ctx);
-                        return ret;
-                }
-                ret = krb5_parse_name(context, target_principal->name.name_string.val[0],
-                                      &enterprise_prinicpal);
-                if (ret) {
-                        talloc_free(mem_ctx);
-                        return ret;
-                }
-                target_principal = enterprise_prinicpal;
-        }
-
         ret = samba_kdc_lookup_server(context, kdc_db_ctx, mem_ctx, target_principal,
-                                       delegation_check_attrs, &realm_dn, &msg);
-
-        krb5_free_principal(context, enterprise_prinicpal);
+                                      SDB_F_GET_CLIENT|SDB_F_GET_SERVER,
+                                      delegation_check_attrs, &realm_dn, &msg);
 
         if (ret != 0) {
@@ -1566 +2350 @@
         }
 
-        orig_sid = samdb_result_dom_sid(mem_ctx, p->msg, "objectSid");
+        orig_sid = samdb_result_dom_sid(mem_ctx, skdc_entry->msg, "objectSid");
         target_sid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
 
@@ -1589 +2373 @@
 samba_kdc_check_pkinit_ms_upn_match(krb5_context context,
                                     struct samba_kdc_db_context *kdc_db_ctx,
-                                     hdb_entry_ex *entry,
+                                    struct samba_kdc_entry *skdc_entry,
                                      krb5_const_principal certificate_principal)
 {
@@ -1597 +2381 @@
         struct dom_sid *orig_sid;
         struct dom_sid *target_sid;
-        struct samba_kdc_entry *p = talloc_get_type(entry->ctx, struct samba_kdc_entry);
         const char *ms_upn_check_attrs[] = {
                 "objectSid", NULL
@@ -1611 +2394 @@
 
         ret = samba_kdc_lookup_client(context, kdc_db_ctx,
-                                       mem_ctx, certificate_principal,
-                                       ms_upn_check_attrs, &realm_dn, &msg);
+                                      mem_ctx, certificate_principal,
+                                      ms_upn_check_attrs, &realm_dn, &msg);
 
         if (ret != 0) {
@@ -1619 +2402 @@
         }
 
-        orig_sid = samdb_result_dom_sid(mem_ctx, p->msg, "objectSid");
+        orig_sid = samdb_result_dom_sid(mem_ctx, skdc_entry->msg, "objectSid");
         target_sid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
 
@@ -1627 +2410 @@
         if (!(orig_sid && target_sid && dom_sid_equal(orig_sid, target_sid))) {
                 talloc_free(mem_ctx);
+#ifdef KRB5_KDC_ERR_CLIENT_NAME_MISMATCH /* Heimdal */
                 return KRB5_KDC_ERR_CLIENT_NAME_MISMATCH;
+#elif defined(KRB5KDC_ERR_CLIENT_NAME_MISMATCH) /* MIT */
+                return KRB5KDC_ERR_CLIENT_NAME_MISMATCH;
+#endif
         }
 
         talloc_free(mem_ctx);
         return ret;
+}
+
+/*
+ * Check if a given entry may delegate to this target principal
+ * with S4U2Proxy.
+ */
+krb5_error_code
+samba_kdc_check_s4u2proxy(krb5_context context,
+                          struct samba_kdc_db_context *kdc_db_ctx,
+                          struct samba_kdc_entry *skdc_entry,
+                          krb5_const_principal target_principal)
+{
+        krb5_error_code ret;
+        char *tmp = NULL;
+        const char *client_dn = NULL;
+        const char *target_principal_name = NULL;
+        struct ldb_message_element *el;
+        struct ldb_val val;
+        unsigned int i;
+        bool found = false;
+
+        TALLOC_CTX *mem_ctx = talloc_named(kdc_db_ctx, 0, "samba_kdc_check_s4u2proxy");
+
+        if (!mem_ctx) {
+                ret = ENOMEM;
+                krb5_set_error_message(context, ret,
+                                       "samba_kdc_check_s4u2proxy:"
+                                       " talloc_named() failed!");
+                return ret;
+        }
+
+        client_dn = ldb_dn_get_linearized(skdc_entry->msg->dn);
+        if (!client_dn) {
+                if (errno == 0) {
+                        errno = ENOMEM;
+                }
+                ret = errno;
+                krb5_set_error_message(context, ret,
+                                       "samba_kdc_check_s4u2proxy:"
+                                       " ldb_dn_get_linearized() failed!");
+                return ret;
+        }
+
+        /*
+         * The main heimdal code already checked that the target_principal
+         * belongs to the same realm as the client.
+         *
+         * So we just need the principal without the realm,
+         * as that is what is configured in the "msDS-AllowedToDelegateTo"
+         * attribute.
+         */
+        ret = krb5_unparse_name_flags(context, target_principal,
+                                      KRB5_PRINCIPAL_UNPARSE_NO_REALM, &tmp);
+        if (ret) {
+                talloc_free(mem_ctx);
+                krb5_set_error_message(context, ret,
+                                       "samba_kdc_check_s4u2proxy:"
+                                       " krb5_unparse_name() failed!");
+                return ret;
+        }
+        DEBUG(10,("samba_kdc_check_s4u2proxy: client[%s] for target[%s]\n",
+                 client_dn, tmp));
+
+        target_principal_name = talloc_strdup(mem_ctx, tmp);
+        SAFE_FREE(tmp);
+        if (target_principal_name == NULL) {
+                ret = ENOMEM;
+                krb5_set_error_message(context, ret,
+                                       "samba_kdc_check_s4u2proxy:"
+                                       " talloc_strdup() failed!");
+                return ret;
+        }
+
+        el = ldb_msg_find_element(skdc_entry->msg, "msDS-AllowedToDelegateTo");
+        if (el == NULL) {
+                goto bad_option;
+        }
+
+        val = data_blob_string_const(target_principal_name);
+
+        for (i=0; i<el->num_values; i++) {
+                struct ldb_val *val1 = &val;
+                struct ldb_val *val2 = &el->values[i];
+                int cmp;
+
+                if (val1->length != val2->length) {
+                        continue;
+                }
+
+                cmp = strncasecmp((const char *)val1->data,
+                                  (const char *)val2->data,
+                                  val1->length);
+                if (cmp != 0) {
+                        continue;
+                }
+
+                found = true;
+                break;
+        }
+
+        if (!found) {
+                goto bad_option;
+        }
+
+        DEBUG(10,("samba_kdc_check_s4u2proxy: client[%s] allowed target[%s]\n",
+                 client_dn, tmp));
+        talloc_free(mem_ctx);
+        return 0;
+
+bad_option:
+        krb5_set_error_message(context, ret,
+                               "samba_kdc_check_s4u2proxy: client[%s] "
+                               "not allowed for delegation to target[%s]",
+                               client_dn,
+                               target_principal_name);
+        talloc_free(mem_ctx);
+        return KRB5KDC_ERR_BADOPTION;
 }
 
@@ -1656 +2560 @@
         kdc_db_ctx->lp_ctx = base_ctx->lp_ctx;
 
-        kdc_get_policy(base_ctx->lp_ctx, NULL, &kdc_db_ctx->policy);
+        /* get default kdc policy */
+        lpcfg_default_kdc_policy(base_ctx->lp_ctx,
+                                 &kdc_db_ctx->policy.svc_tkt_lifetime,
+                                 &kdc_db_ctx->policy.usr_tkt_lifetime,
+                                 &kdc_db_ctx->policy.renewal_lifetime);
 
         session_info = system_session(kdc_db_ctx->lp_ctx);
@@ -1667 +2575 @@
                                           base_ctx->lp_ctx, session_info, 0);
         if (kdc_db_ctx->samdb == NULL) {
-                DEBUG(1, ("hdb_samba4_create: Cannot open samdb for KDC backend!"));
+                DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot open samdb for KDC backend!"));
                 talloc_free(kdc_db_ctx);
                 return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
@@ -1675 +2583 @@
         ldb_ret = samdb_rodc(kdc_db_ctx->samdb, &kdc_db_ctx->rodc);
         if (ldb_ret != LDB_SUCCESS) {
-                DEBUG(1, ("hdb_samba4_create: Cannot determine if we are an RODC in KDC backend: %s\n",
+                DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot determine if we are an RODC in KDC backend: %s\n",
                           ldb_errstring(kdc_db_ctx->samdb)));
                 talloc_free(kdc_db_ctx);
@@ -1686 +2594 @@
                 struct ldb_dn *server_dn = samdb_server_dn(kdc_db_ctx->samdb, kdc_db_ctx);
                 if (!server_dn) {
-                        DEBUG(1, ("hdb_samba4_create: Cannot determine server DN in KDC backend: %s\n",
+                        DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot determine server DN in KDC backend: %s\n",
                                   ldb_errstring(kdc_db_ctx->samdb)));
                         talloc_free(kdc_db_ctx);
@@ -1695 +2603 @@
                                              "serverReference", &account_dn);
                 if (ldb_ret != LDB_SUCCESS) {
-                        DEBUG(1, ("hdb_samba4_create: Cannot determine server account in KDC backend: %s\n",
+                        DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot determine server account in KDC backend: %s\n",
                                   ldb_errstring(kdc_db_ctx->samdb)));
                         talloc_free(kdc_db_ctx);
@@ -1705 +2613 @@
                 talloc_free(account_dn);
                 if (ldb_ret != LDB_SUCCESS) {
-                        DEBUG(1, ("hdb_samba4_create: Cannot determine RODC krbtgt account in KDC backend: %s\n",
+                        DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot determine RODC krbtgt account in KDC backend: %s\n",
                                   ldb_errstring(kdc_db_ctx->samdb)));
                         talloc_free(kdc_db_ctx);
@@ -1714 +2622 @@
                                           &msg, kdc_db_ctx->krbtgt_dn, LDB_SCOPE_BASE,
                                           secondary_keytab,
-                                          0,
+                                          DSDB_SEARCH_NO_GLOBAL_CATALOG,
                                           "(&(objectClass=user)(msDS-SecondaryKrbTgtNumber=*))");
                 if (ldb_ret != LDB_SUCCESS) {
-                        DEBUG(1, ("hdb_samba4_create: Cannot read krbtgt account %s in KDC backend to get msDS-SecondaryKrbTgtNumber: %s: %s\n",
+                        DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot read krbtgt account %s in KDC backend to get msDS-SecondaryKrbTgtNumber: %s: %s\n",
                                   ldb_dn_get_linearized(kdc_db_ctx->krbtgt_dn),
                                   ldb_errstring(kdc_db_ctx->samdb),
@@ -1726 +2634 @@
                 my_krbtgt_number = ldb_msg_find_attr_as_int(msg, "msDS-SecondaryKrbTgtNumber", -1);
                 if (my_krbtgt_number == -1) {
-                        DEBUG(1, ("hdb_samba4_create: Cannot read msDS-SecondaryKrbTgtNumber from krbtgt account %s in KDC backend: got %d\n",
+                        DEBUG(1, ("samba_kdc_setup_db_ctx: Cannot read msDS-SecondaryKrbTgtNumber from krbtgt account %s in KDC backend: got %d\n",
                                   ldb_dn_get_linearized(kdc_db_ctx->krbtgt_dn),
                                   my_krbtgt_number));
@@ -1737 +2645 @@
                 kdc_db_ctx->my_krbtgt_number = 0;
                 ldb_ret = dsdb_search_one(kdc_db_ctx->samdb, kdc_db_ctx,
-                                          &msg, NULL, LDB_SCOPE_SUBTREE,
+                                          &msg,
+                                          ldb_get_default_basedn(kdc_db_ctx->samdb),
+                                          LDB_SCOPE_SUBTREE,
                                           krbtgt_attrs,
-                                          0,
+                                          DSDB_SEARCH_NO_GLOBAL_CATALOG,
                                           "(&(objectClass=user)(samAccountName=krbtgt))");