Remove yet more uses of global_loadparm.
[jelmer/samba4-debian.git] / source / kdc / hdb-ldb.c
index 763550106447d94478c3d79132db52a401c31d02..9a17e581e3f650f1646b5ac05e33e1eea9cdf0b8 100644 (file)
  */
 
 #include "includes.h"
+#include "system/time.h"
 #include "kdc.h"
-#include "ads.h"
+#include "dsdb/common/flags.h"
 #include "hdb.h"
+#include "krb5_locl.h"
 #include "lib/ldb/include/ldb.h"
-#include "system/iconv.h"
+#include "lib/ldb/include/ldb_errors.h"
+#include "librpc/gen_ndr/netlogon.h"
+#include "auth/auth.h"
+#include "auth/credentials/credentials.h"
+#include "auth/auth_sam.h"
+#include "util/util_ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "libcli/auth/libcli_auth.h"
+#include "param/param.h"
 
 enum hdb_ldb_ent_type 
 { HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER, 
   HDB_LDB_ENT_TYPE_KRBTGT, HDB_LDB_ENT_TYPE_ANY };
 
-static const char * const krb5_attrs[] = {
-       "objectClass",
-       "cn",
-       "sAMAccountName",
-
-       "userPrincipalName",
-       "servicePrincipalName",
-
-       "userAccountControl",
-       "sAMAccountType",
-
-       "objectSid",
-       "primaryGroupID",
-       "memberOf",
-
-       "unicodePWD",
-       "lmPwdHash",
-       "ntPwdHash",
-
-       "badPwdCount",
-       "badPasswordTime",
-       "lastLogoff",
-       "lastLogon",
-       "pwdLastSet",
-       "accountExpires",
-       "logonCount",
-
-       "objectGUID",
-       "whenCreated",
-       "whenChanged",
-       "uSNCreated",
-       "uSNChanged",
-       "msDS-KeyVersionNumber",
+static const char *realm_ref_attrs[] = {
+       "nCName", 
+       "dnsRoot", 
        NULL
 };
 
@@ -85,7 +67,7 @@ static KerberosTime ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, con
     const char *gentime;
     struct tm tm;
 
-    gentime = ldb_msg_find_string(msg, attr, NULL);
+    gentime = ldb_msg_find_attr_as_string(msg, attr, NULL);
     if (!gentime)
        return default_val;
 
@@ -101,8 +83,6 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
 {
        HDBFlags flags = int2HDBFlags(0);
 
-       krb5_warnx(context, "uf2HDBFlags: userAccountControl: %08x\n", userAccountControl);
-
        /* we don't allow kadmin deletes */
        flags.immutable = 1;
 
@@ -111,14 +91,14 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
 
        flags.renewable = 1;
 
+       /* All accounts are servers, but this may be disabled again in the caller */
+       flags.server = 1;
+
        /* Account types - clear the invalid bit if it turns out to be valid */
        if (userAccountControl & UF_NORMAL_ACCOUNT) {
                if (ent_type == HDB_LDB_ENT_TYPE_CLIENT || ent_type == HDB_LDB_ENT_TYPE_ANY) {
                        flags.client = 1;
                }
-               if (ent_type == HDB_LDB_ENT_TYPE_SERVER || ent_type == HDB_LDB_ENT_TYPE_ANY) {
-                       flags.server = 1;
-               }
                flags.invalid = 0;
        }
        
@@ -132,18 +112,12 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
                if (ent_type == HDB_LDB_ENT_TYPE_CLIENT || ent_type == HDB_LDB_ENT_TYPE_ANY) {
                        flags.client = 1;
                }
-               if (ent_type == HDB_LDB_ENT_TYPE_SERVER || ent_type == HDB_LDB_ENT_TYPE_ANY) {
-                       flags.server = 1;
-               }
                flags.invalid = 0;
        }
        if (userAccountControl & UF_SERVER_TRUST_ACCOUNT) {
                if (ent_type == HDB_LDB_ENT_TYPE_CLIENT || ent_type == HDB_LDB_ENT_TYPE_ANY) {
                        flags.client = 1;
                }
-               if (ent_type == HDB_LDB_ENT_TYPE_SERVER || ent_type == HDB_LDB_ENT_TYPE_ANY) {
-                       flags.server = 1;
-               }
                flags.invalid = 0;
        }
 
@@ -160,20 +134,13 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
        }
 */
 /*
-       if (userAccountControl & UF_PASSWORD_CANT_CHANGE) {
-               flags.invalid = 1;
-       }
-*/
-/*
-       if (userAccountControl & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED) {
-               flags.invalid = 1;
-       }
+       UF_PASSWORD_CANT_CHANGE and UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED are irrelevent
 */
        if (userAccountControl & UF_TEMP_DUPLICATE_ACCOUNT) {
                flags.invalid = 1;
        }
 
-/* UF_DONT_EXPIRE_PASSWD handled in LDB_message2entry() */
+/* UF_DONT_EXPIRE_PASSWD and UF_USE_DES_KEY_ONLY handled in LDB_message2entry() */
 
 /*
        if (userAccountControl & UF_MNS_LOGON_ACCOUNT) {
@@ -183,32 +150,232 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
        if (userAccountControl & UF_SMARTCARD_REQUIRED) {
                flags.require_hwauth = 1;
        }
-       if (flags.server && (userAccountControl & UF_TRUSTED_FOR_DELEGATION)) {
-               flags.forwardable = 1;
-               flags.proxiable = 1;
-       } else if (flags.client && (userAccountControl & UF_NOT_DELEGATED)) {
-               flags.forwardable = 0;
-               flags.proxiable = 0;
-       } else {
+       if (userAccountControl & UF_TRUSTED_FOR_DELEGATION) {
+               flags.ok_as_delegate = 1;
+       }       
+       if (!(userAccountControl & UF_NOT_DELEGATED)) {
                flags.forwardable = 1;
                flags.proxiable = 1;
        }
 
-/*
-       if (userAccountControl & UF_SMARTCARD_USE_DES_KEY_ONLY) {
-               flags.invalid = 1;
-       }
-*/
        if (userAccountControl & UF_DONT_REQUIRE_PREAUTH) {
                flags.require_preauth = 0;
        } else {
                flags.require_preauth = 1;
 
        }
+       return flags;
+}
+
+static int hdb_ldb_destrutor(struct hdb_ldb_private *private)
+{
+    hdb_entry_ex *entry_ex = private->entry_ex;
+    free_hdb_entry(&entry_ex->entry);
+    return 0;
+}
+
+static void hdb_ldb_free_entry(krb5_context context, hdb_entry_ex *entry_ex)
+{
+       talloc_free(entry_ex->ctx);
+}
+
+static krb5_error_code LDB_message2entry_keys(krb5_context context,
+                                             struct smb_iconv_convenience *iconv_convenience,
+                                             TALLOC_CTX *mem_ctx,
+                                             struct ldb_message *msg,
+                                             unsigned int userAccountControl,
+                                             hdb_entry_ex *entry_ex)
+{
+       krb5_error_code ret = 0;
+       enum ndr_err_code ndr_err;
+       struct samr_Password *hash;
+       const struct ldb_val *sc_val;
+       struct supplementalCredentialsBlob scb;
+       struct supplementalCredentialsPackage *scp = NULL;
+       struct package_PrimaryKerberosBlob _pkb;
+       struct package_PrimaryKerberosCtr3 *pkb3 = NULL;
+       uint32_t i;
+       uint32_t allocated_keys = 0;
+
+       entry_ex->entry.keys.val = NULL;
+       entry_ex->entry.keys.len = 0;
+
+       entry_ex->entry.kvno = ldb_msg_find_attr_as_int(msg, "msDS-KeyVersionNumber", 0);
+
+       /* Get keys from the db */
+
+       hash = samdb_result_hash(mem_ctx, msg, "unicodePwd");
+       sc_val = ldb_msg_find_ldb_val(msg, "supplementalCredentials");
+
+       /* unicodePwd for enctype 0x17 (23) if present */
+       if (hash) {
+               allocated_keys++;
+       }
+
+       /* supplementalCredentials if present */
+       if (sc_val) {
+               ndr_err = ndr_pull_struct_blob_all(sc_val, mem_ctx, iconv_convenience, &scb,
+                                                  (ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       dump_data(0, sc_val->data, sc_val->length);
+                       ret = EINVAL;
+                       goto out;
+               }
 
-       krb5_warnx(context, "uf2HDBFlags: HDBFlags: %08x\n", HDBFlags2int(flags));
+               for (i=0; i < scb.sub.num_packages; i++) {
+                       if (scb.sub.packages[i].unknown1 != 0x00000001) {
+                               continue;
+                       }
 
-       return flags;
+                       if (strcmp("Primary:Kerberos", scb.sub.packages[i].name) != 0) {
+                               continue;
+                       }
+
+                       if (!scb.sub.packages[i].data || !scb.sub.packages[i].data[0]) {
+                               continue;
+                       }
+
+                       scp = &scb.sub.packages[i];
+                       break;
+               }
+       }
+       /* Primary:Kerberos element of supplementalCredentials */
+       if (scp) {
+               DATA_BLOB blob;
+
+               blob = strhex_to_data_blob(scp->data);
+               if (!blob.data) {
+                       ret = ENOMEM;
+                       goto out;
+               }
+               talloc_steal(mem_ctx, blob.data);
+
+               /* TODO: use ndr_pull_struct_blob_all(), when the ndr layer handles it correct with relative pointers */
+               ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, iconv_convenience, &_pkb,
+                                              (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       krb5_set_error_string(context, "LDB_message2entry_keys: could not parse package_PrimaryKerberosBlob");
+                       krb5_warnx(context, "LDB_message2entry_keys: could not parse package_PrimaryKerberosBlob");
+                       ret = EINVAL;
+                       goto out;
+               }
+
+               if (_pkb.version != 3) {
+                       krb5_set_error_string(context, "LDB_message2entry_keys: could not parse PrimaryKerberos not version 3");
+                       krb5_warnx(context, "LDB_message2entry_keys: could not parse PrimaryKerberos not version 3");
+                       ret = EINVAL;
+                       goto out;
+               }
+               
+               pkb3 = &_pkb.ctr.ctr3;
+
+               allocated_keys += pkb3->num_keys;
+       }
+
+       if (allocated_keys == 0) {
+               /* oh, no password.  Apparently (comment in
+                * hdb-ldap.c) this violates the ASN.1, but this
+                * allows an entry with no keys (yet). */
+               return 0;
+       }
+
+       /* allocate space to decode into */
+       entry_ex->entry.keys.len = 0;
+       entry_ex->entry.keys.val = calloc(allocated_keys, sizeof(Key));
+       if (entry_ex->entry.keys.val == NULL) {
+               ret = ENOMEM;
+               goto out;
+       }
+
+       if (hash && !(userAccountControl & UF_USE_DES_KEY_ONLY)) {
+               Key key;
+
+               key.mkvno = 0;
+               key.salt = NULL; /* No salt for this enc type */
+
+               ret = krb5_keyblock_init(context,
+                                        ENCTYPE_ARCFOUR_HMAC_MD5,
+                                        hash->hash, sizeof(hash->hash), 
+                                        &key.key);
+               if (ret) {
+                       goto out;
+               }
+
+               entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
+               entry_ex->entry.keys.len++;
+       }
+
+       if (pkb3) {
+               for (i=0; i < pkb3->num_keys; i++) {
+                       bool use = true;
+                       Key key;
+
+                       if (!pkb3->keys[i].value) continue;
+
+                       if (userAccountControl & UF_USE_DES_KEY_ONLY) {
+                               switch (pkb3->keys[i].keytype) {
+                               case ENCTYPE_DES_CBC_CRC:
+                               case ENCTYPE_DES_CBC_MD5:
+                                       break;
+                               default:
+                                       use = false;
+                                       break;
+                               }
+                       }
+
+                       if (!use) continue;
+
+                       key.mkvno = 0;
+
+                       if (pkb3->salt.string) {
+                               DATA_BLOB salt;
+
+                               salt = data_blob_string_const(pkb3->salt.string);
+
+                               key.salt = calloc(1, sizeof(*key.salt));
+                               if (key.salt == NULL) {
+                                       ret = ENOMEM;
+                                       goto out;
+                               }
+
+                               key.salt->type = hdb_pw_salt;
+
+                               ret = krb5_data_copy(&key.salt->salt, salt.data, salt.length);
+                               if (ret) {
+                                       free(key.salt);
+                                       key.salt = NULL;
+                                       goto out;
+                               }
+                       }
+
+                       ret = krb5_keyblock_init(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);
+                                       free(key.salt);
+                                       key.salt = NULL;
+                               }
+                               goto out;
+                       }
+
+                       entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
+                       entry_ex->entry.keys.len++;
+               }
+       }
+
+out:
+       if (ret != 0) {
+               entry_ex->entry.keys.len = 0;
+       }
+       if (entry_ex->entry.keys.len == 0 && entry_ex->entry.keys.val) {
+               free(entry_ex->entry.keys.val);
+               entry_ex->entry.keys.val = NULL;
+       }
+       return ret;
 }
 
 /*
@@ -216,16 +383,39 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
  */
 static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, 
                                         TALLOC_CTX *mem_ctx, krb5_const_principal principal,
-                                        enum hdb_ldb_ent_type ent_type, struct ldb_message *realm_msg,
+                                        enum hdb_ldb_ent_type ent_type, 
                                         struct ldb_message *msg,
-                                        hdb_entry *ent)
+                                        struct ldb_message *realm_ref_msg,
+                                        hdb_entry_ex *entry_ex)
 {
-       const char *unicodePwd;
-       int userAccountControl;
+       unsigned int userAccountControl;
        int i;
        krb5_error_code ret = 0;
-       const char *dnsdomain = ldb_msg_find_string(realm_msg, "dnsDomain", NULL);
+       krb5_boolean is_computer = FALSE;
+       const char *dnsdomain = ldb_msg_find_attr_as_string(realm_ref_msg, "dnsRoot", NULL);
        char *realm = strupper_talloc(mem_ctx, dnsdomain);
+       struct loadparm_context *lp_ctx = ldb_get_opaque((struct ldb_context *)db->hdb_db, "loadparm");
+       struct ldb_dn *domain_dn = samdb_result_dn((struct ldb_context *)db->hdb_db,
+                                                       mem_ctx,
+                                                       realm_ref_msg,
+                                                       "nCName",
+                                                       ldb_dn_new(mem_ctx, (struct ldb_context *)db->hdb_db, NULL));
+
+       struct hdb_ldb_private *private;
+       NTTIME acct_expiry;
+
+       struct ldb_message_element *objectclasses;
+       struct ldb_val computer_val;
+       computer_val.data = discard_const_p(uint8_t,"computer");
+       computer_val.length = strlen((const char *)computer_val.data);
+       
+       objectclasses = ldb_msg_find_element(msg, "objectClass");
+       
+       if (objectclasses && ldb_msg_find_val(objectclasses, &computer_val)) {
+               is_computer = TRUE;
+       }
+
+       memset(entry_ex, 0, sizeof(*entry_ex));
 
        if (!realm) {
                krb5_set_error_string(context, "talloc_strdup: out of memory");
@@ -233,25 +423,37 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
                goto out;
        }
                        
-       krb5_warnx(context, "LDB_message2entry:\n");
+       private = talloc(mem_ctx, struct hdb_ldb_private);
+       if (!private) {
+               ret = ENOMEM;
+               goto out;
+       }
+
+       private->entry_ex = entry_ex;
+       private->iconv_convenience = lp_iconv_convenience(lp_ctx);
+       private->netbios_name = lp_netbios_name(lp_ctx);
 
-       memset(ent, 0, sizeof(*ent));
+       talloc_set_destructor(private, hdb_ldb_destrutor);
+
+       entry_ex->ctx = private;
+       entry_ex->free_entry = hdb_ldb_free_entry;
+
+       userAccountControl = ldb_msg_find_attr_as_uint(msg, "userAccountControl", 0);
 
-       userAccountControl = ldb_msg_find_int(msg, "userAccountControl", 0);
        
-       ent->principal = malloc(sizeof(*(ent->principal)));
+       entry_ex->entry.principal = malloc(sizeof(*(entry_ex->entry.principal)));
        if (ent_type == HDB_LDB_ENT_TYPE_ANY && principal == NULL) {
-               const char *samAccountName = ldb_msg_find_string(msg, "samAccountName", NULL);
+               const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
                if (!samAccountName) {
                        krb5_set_error_string(context, "LDB_message2entry: no samAccountName present");
                        ret = ENOENT;
                        goto out;
                }
-               samAccountName = ldb_msg_find_string(msg, "samAccountName", NULL);
-               krb5_make_principal(context, &ent->principal, realm, samAccountName, NULL);
+               samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+               krb5_make_principal(context, &entry_ex->entry.principal, realm, samAccountName, NULL);
        } else {
                char *strdup_realm;
-               ret = copy_Principal(principal, ent->principal);
+               ret = copy_Principal(principal, entry_ex->entry.principal);
                if (ret) {
                        krb5_clear_error_string(context);
                        goto out;
@@ -263,9 +465,6 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
                 * replace the client principal's realm with the one
                 * we determine from our records */
                
-               /* don't leak */
-               free(*krb5_princ_realm(context, ent->principal));
-               
                /* this has to be with malloc() */
                strdup_realm = strdup(realm);
                if (!strdup_realm) {
@@ -273,175 +472,116 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
                        krb5_clear_error_string(context);
                        goto out;
                }
-               krb5_princ_set_realm(context, ent->principal, &strdup_realm);
+               free(*krb5_princ_realm(context, entry_ex->entry.principal));
+               krb5_princ_set_realm(context, entry_ex->entry.principal, &strdup_realm);
        }
 
-       ent->kvno = ldb_msg_find_int(msg, "msDS-KeyVersionNumber", 0);
-
-       ent->flags = uf2HDBFlags(context, userAccountControl, ent_type);
+       entry_ex->entry.flags = uf2HDBFlags(context, userAccountControl, ent_type);
 
        if (ent_type == HDB_LDB_ENT_TYPE_KRBTGT) {
-               ent->flags.invalid = 0;
-               ent->flags.server = 1;
+               entry_ex->entry.flags.invalid = 0;
+               entry_ex->entry.flags.server = 1;
+               entry_ex->entry.flags.forwardable = 1;
+               entry_ex->entry.flags.ok_as_delegate = 1;
+       }
+
+       if (lp_parm_bool(lp_ctx, NULL, "kdc", "require spn for service", true)) {
+               if (!is_computer && !ldb_msg_find_attr_as_string(msg, "servicePrincipalName", NULL)) {
+                       entry_ex->entry.flags.server = 0;
+               }
        }
 
        /* use 'whenCreated' */
-       ent->created_by.time = ldb_msg_find_krb5time_ldap_time(msg, "whenCreated", 0);
+       entry_ex->entry.created_by.time = ldb_msg_find_krb5time_ldap_time(msg, "whenCreated", 0);
        /* use '???' */
-       ent->created_by.principal = NULL;
+       entry_ex->entry.created_by.principal = NULL;
 
-       ent->modified_by = (Event *) malloc(sizeof(Event));
-       if (ent->modified_by == NULL) {
+       entry_ex->entry.modified_by = (Event *) malloc(sizeof(Event));
+       if (entry_ex->entry.modified_by == NULL) {
                krb5_set_error_string(context, "malloc: out of memory");
                ret = ENOMEM;
                goto out;
        }
 
        /* use 'whenChanged' */
-       ent->modified_by->time = ldb_msg_find_krb5time_ldap_time(msg, "whenChanged", 0);
+       entry_ex->entry.modified_by->time = ldb_msg_find_krb5time_ldap_time(msg, "whenChanged", 0);
        /* use '???' */
-       ent->modified_by->principal = NULL;
-
-       ent->valid_start = NULL;
+       entry_ex->entry.modified_by->principal = NULL;
 
-       ent->valid_end = NULL;
-       ent->pw_end = NULL;
+       entry_ex->entry.valid_start = NULL;
 
-       ent->max_life = NULL;
-
-       ent->max_renew = NULL;
-
-       ent->generation = NULL;
-
-       /* create the keys and enctypes */
-       unicodePwd = ldb_msg_find_string(msg, "unicodePwd", NULL);
-       if (unicodePwd) {
-               /* Many, many thanks to lukeh@padl.com for this
-                * algorithm, described in his Nov 10 2004 mail to
-                * samba-technical@samba.org */
-
-               Principal *salt_principal;
-               const char *user_principal_name = ldb_msg_find_string(msg, "userPrincipalName", NULL);
-               struct ldb_message_element *objectclasses;
-               struct ldb_val computer_val;
-               computer_val.data = discard_const_p(uint8_t,"computer");
-               computer_val.length = strlen((const char *)computer_val.data);
-               
-               objectclasses = ldb_msg_find_element(msg, "objectClass");
-
-               if (objectclasses && ldb_msg_find_val(objectclasses, &computer_val)) {
-                       /* Determine a salting principal */
-                       char *samAccountName = talloc_strdup(mem_ctx, ldb_msg_find_string(msg, "samAccountName", NULL));
-                       char *saltbody;
-                       if (!samAccountName) {
-                               krb5_set_error_string(context, "LDB_message2entry: no samAccountName present");
-                               ret = ENOENT;
-                               goto out;
-                       }
-                       if (samAccountName[strlen(samAccountName)-1] == '$') {
-                               samAccountName[strlen(samAccountName)-1] = '\0';
-                       }
-                       saltbody = talloc_asprintf(mem_ctx, "%s.%s", samAccountName, dnsdomain);
-                       
-                       ret = krb5_make_principal(context, &salt_principal, realm, "host", saltbody, NULL);
-               } else if (user_principal_name) {
-                       char *p;
-                       user_principal_name = talloc_strdup(mem_ctx, user_principal_name);
-                       if (!user_principal_name) {
-                               ret = ENOMEM;
-                               goto out;
-                       } else {
-                               p = strchr(user_principal_name, '@');
-                               if (p) {
-                                       p[0] = '\0';
-                               }
-                               ret = krb5_make_principal(context, &salt_principal, realm, user_principal_name, NULL);
-                       } 
-               } else {
-                       const char *samAccountName = ldb_msg_find_string(msg, "samAccountName", NULL);
-                       ret = krb5_make_principal(context, &salt_principal, realm, samAccountName, NULL);
-               }
-
-               if (ret == 0) {
-                       size_t num_keys = ent->keys.len;
-                       /*
-                        * create keys from unicodePwd
-                        */
-                       ret = hdb_generate_key_set_password(context, salt_principal, 
-                                                           unicodePwd, 
-                                                           &ent->keys.val, &num_keys);
-                       ent->keys.len = num_keys;
-                       krb5_free_principal(context, salt_principal);
-               }
-
-               if (ret != 0) {
-                       krb5_warnx(context, "could not generate keys from unicodePwd\n");
-                       ent->keys.val = NULL;
-                       ent->keys.len = 0;
+       acct_expiry = samdb_result_nttime(msg, "accountExpires", (NTTIME)-1);
+       if ((acct_expiry == (NTTIME)-1) ||
+           (acct_expiry == 0x7FFFFFFFFFFFFFFFULL)) {
+               entry_ex->entry.valid_end = NULL;
+       } else {
+               entry_ex->entry.valid_end = malloc(sizeof(*entry_ex->entry.valid_end));
+               if (entry_ex->entry.valid_end == NULL) {
+                       ret = ENOMEM;
                        goto out;
                }
-       } else {
-               const struct ldb_val *val;
-               krb5_data keyvalue;
-
-               val = ldb_msg_find_ldb_val(msg, "ntPwdHash");
-               if (!val) {
-                       krb5_warnx(context, "neither type of key available for this account\n");
-                       ent->keys.val = NULL;
-                       ent->keys.len = 0;
-               } else if (val->length < 16) {
-                       ent->keys.val = NULL;
-                       ent->keys.len = 0;
-                       krb5_warnx(context, "ntPwdHash has invalid length: %d\n",
-                                  (int)val->length);
+               *entry_ex->entry.valid_end = nt_time_to_unix(acct_expiry);
+       }
+
+       if (ent_type != HDB_LDB_ENT_TYPE_KRBTGT) {
+               NTTIME must_change_time
+                       = samdb_result_force_password_change((struct ldb_context *)db->hdb_db, mem_ctx, 
+                                                            domain_dn, msg);
+               if (must_change_time == 0x7FFFFFFFFFFFFFFFULL) {
+                       entry_ex->entry.pw_end = NULL;
                } else {
-                       ret = krb5_data_alloc (&keyvalue, 16);
-                       if (ret) {
-                               krb5_set_error_string(context, "malloc: out of memory");
+                       entry_ex->entry.pw_end = malloc(sizeof(*entry_ex->entry.pw_end));
+                       if (entry_ex->entry.pw_end == NULL) {
                                ret = ENOMEM;
                                goto out;
                        }
+                       *entry_ex->entry.pw_end = nt_time_to_unix(must_change_time);
+               }
+       } else {
+               entry_ex->entry.pw_end = NULL;
+       }
+                       
+       entry_ex->entry.max_life = NULL;
 
-                       memcpy(keyvalue.data, val->data, 16);
+       entry_ex->entry.max_renew = NULL;
 
-                       ent->keys.val = malloc(sizeof(ent->keys.val[0]));
-                       if (ent->keys.val == NULL) {
-                               krb5_data_free(&keyvalue);
-                               krb5_set_error_string(context, "malloc: out of memory");
-                               ret = ENOMEM;
-                               goto out;
-                       }
-                       
-                       memset(&ent->keys.val[0], 0, sizeof(Key));
-                       ent->keys.val[0].key.keytype = ETYPE_ARCFOUR_HMAC_MD5;
-                       ent->keys.val[0].key.keyvalue = keyvalue;
-                       
-                       ent->keys.len = 1;
-               }
-       }               
+       entry_ex->entry.generation = NULL;
 
+       /* Get keys from the db */
+       ret = LDB_message2entry_keys(context, private->iconv_convenience, private, msg, userAccountControl, entry_ex);
+       if (ret) {
+               /* Could be bougus data in the entry, or out of memory */
+               goto out;
+       }
 
-       ent->etypes = malloc(sizeof(*(ent->etypes)));
-       if (ent->etypes == NULL) {
-               krb5_set_error_string(context, "malloc: out of memory");
+       entry_ex->entry.etypes = malloc(sizeof(*(entry_ex->entry.etypes)));
+       if (entry_ex->entry.etypes == NULL) {
+               krb5_clear_error_string(context);
                ret = ENOMEM;
                goto out;
        }
-       ent->etypes->len = ent->keys.len;
-       ent->etypes->val = calloc(ent->etypes->len, sizeof(int));
-       if (ent->etypes->val == NULL) {
-               krb5_set_error_string(context, "malloc: out of memory");
+       entry_ex->entry.etypes->len = entry_ex->entry.keys.len;
+       entry_ex->entry.etypes->val = calloc(entry_ex->entry.etypes->len, sizeof(int));
+       if (entry_ex->entry.etypes->val == NULL) {
+               krb5_clear_error_string(context);
                ret = ENOMEM;
                goto out;
        }
-       for (i=0; i < ent->etypes->len; i++) {
-               ent->etypes->val[i] = ent->keys.val[i].key.keytype;
+       for (i=0; i < entry_ex->entry.etypes->len; i++) {
+               entry_ex->entry.etypes->val[i] = entry_ex->entry.keys.val[i].key.keytype;
        }
 
+
+       private->msg = talloc_steal(private, msg);
+       private->realm_ref_msg = talloc_steal(private, realm_ref_msg);
+       private->samdb = (struct ldb_context *)db->hdb_db;
+       
 out:
        if (ret != 0) {
-               /* I don't think this frees ent itself. */
-               hdb_free_entry(context, ent);
+               /* This doesn't free ent itself, that is for the eventual caller to do */
+               hdb_free_entry(context, entry_ex);
+       } else {
+               talloc_steal(db, entry_ex->ctx);
        }
 
        return ret;
@@ -451,33 +591,20 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
                                            TALLOC_CTX *mem_ctx,
                                            krb5_const_principal principal,
                                            enum hdb_ldb_ent_type ent_type,
-                                           const struct ldb_dn *realm_dn,
+                                           struct ldb_dn *realm_dn,
                                            struct ldb_message ***pmsg)
 {
        krb5_error_code ret;
-       int count;
+       int lret;
        char *filter = NULL;
-       const char * const *princ_attrs = krb5_attrs;
+       const char * const *princ_attrs = user_attrs;
 
-       char *princ_str;
-       char *princ_str_talloc;
        char *short_princ;
        char *short_princ_talloc;
 
-       char *realm_dn_str;
-
-       struct ldb_message **msg = NULL;
-
-       /* Structure assignment, so we don't mess with the source parameter */
-       struct Principal princ = *principal;
+       struct ldb_result *res = NULL;
 
-       /* Allow host/dns.name/realm@REALM, just convert into host/dns.name@REALM */
-       if (princ.name.name_string.len == 3
-           && strcasecmp_m(princ.name.name_string.val[2], princ.realm) == 0) { 
-               princ.name.name_string.len = 2;
-       }
-
-       ret = krb5_unparse_name(context, &princ, &princ_str);
+       ret = krb5_unparse_name_flags(context, principal,  KRB5_PRINCIPAL_UNPARSE_NO_REALM, &short_princ);
 
        if (ret != 0) {
                krb5_set_error_string(context, "LDB_lookup_principal: could not parse principal");
@@ -485,40 +612,27 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
                return ret;
        }
 
-       ret = krb5_unparse_name_norealm(context, &princ, &short_princ);
-
-       if (ret != 0) {
-               free(princ_str);
-               krb5_set_error_string(context, "LDB_lookup_principal: could not parse principal");
-               krb5_warnx(context, "LDB_lookup_principal: could not parse principal");
-               return ret;
-       }
-
-       princ_str_talloc = talloc_strdup(mem_ctx, princ_str);
        short_princ_talloc = talloc_strdup(mem_ctx, short_princ);
-       free(princ_str);
        free(short_princ);
-       if (!short_princ || !princ_str_talloc) {
+       if (!short_princ_talloc) {
                krb5_set_error_string(context, "LDB_lookup_principal: talloc_strdup() failed!");
                return ENOMEM;
        }
 
        switch (ent_type) {
+       case HDB_LDB_ENT_TYPE_CLIENT:
+               /* Can't happen */
+               return EINVAL;
+       case HDB_LDB_ENT_TYPE_ANY:
+               /* Can't happen */
+               return EINVAL;
        case HDB_LDB_ENT_TYPE_KRBTGT:
                filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(samAccountName=%s))", 
                                         KRB5_TGS_NAME);
                break;
-       case HDB_LDB_ENT_TYPE_CLIENT:
-               filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(|(samAccountName=%s)(userPrincipalName=%s)))", 
-                                        short_princ_talloc, princ_str_talloc);
-               break;
        case HDB_LDB_ENT_TYPE_SERVER:
-               filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(|(samAccountName=%s)(servicePrincipalName=%s)))", 
-                                        short_princ_talloc, short_princ_talloc);
-               break;
-       case HDB_LDB_ENT_TYPE_ANY:
-               filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(|(|(samAccountName=%s)(servicePrincipalName=%s))(userPrincipalName=%s)))", 
-                                        short_princ_talloc, short_princ_talloc, princ_str_talloc);
+               filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(samAccountName=%s))", 
+                                        short_princ_talloc);
                break;
        }
 
@@ -527,26 +641,19 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
                return ENOMEM;
        }
 
-       count = ldb_search(ldb_ctx, realm_dn, LDB_SCOPE_SUBTREE, filter, 
-                          princ_attrs, &msg);
+       lret = ldb_search(ldb_ctx, realm_dn, LDB_SCOPE_SUBTREE, filter, princ_attrs, &res);
 
-       realm_dn_str = ldb_dn_linearize(mem_ctx, realm_dn);
-
-       if (count < 1) {
-               krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' failed: %d", 
-                          realm_dn_str, filter, count);
-               krb5_set_error_string(context, "ldb_search: basedn: '%s' filter: '%s' failed: %d", 
-                                     realm_dn_str, filter, count);
+       if (lret != LDB_SUCCESS) {
+               DEBUG(3, ("Failed to search for %s: %s\n", filter, ldb_errstring(ldb_ctx)));
                return HDB_ERR_NOENTRY;
-       } else if (count > 1) {
-               talloc_free(msg);
-               krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d", 
-                          realm_dn_str, filter, count);
-               krb5_set_error_string(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d", 
-                                     realm_dn_str, filter, count);
+       } 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;
        }
-       *pmsg = talloc_steal(mem_ctx, msg);
+       talloc_steal(mem_ctx, res->msgs);
+       *pmsg = res->msgs;
+       talloc_free(res);
        return 0;
 }
 
@@ -555,151 +662,34 @@ static krb5_error_code LDB_lookup_realm(krb5_context context, struct ldb_context
                                        const char *realm,
                                        struct ldb_message ***pmsg)
 {
-       int count;
-       struct ldb_dn *realm_dn;
-       const char *realm_dn_str;
-       char *cross_ref_filter;
-       struct ldb_message **cross_ref_msg;
-       struct ldb_message **msg;
-
-       const char *cross_ref_attrs[] = {
-               "nCName", 
-               NULL
-       };
-
-       const char *realm_attrs[] = {
-               "dnsDomain", 
-               "maxPwdAge",
-               NULL
-       };
-
-       cross_ref_filter = talloc_asprintf(mem_ctx, 
-                                          "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))",
-                                          realm, realm);
-       if (!cross_ref_filter) {
-               krb5_set_error_string(context, "asprintf: out of memory");
-               return ENOMEM;
-       }
-
-       count = ldb_search(ldb_ctx, NULL, LDB_SCOPE_SUBTREE, cross_ref_filter, 
-                          cross_ref_attrs, &cross_ref_msg);
-
-       if (count < 1) {
-               krb5_warnx(context, "ldb_search: filter: '%s' failed: %d", cross_ref_filter, count);
-               krb5_set_error_string(context, "ldb_search: filter: '%s' failed: %d", cross_ref_filter, count);
-
-               talloc_free(cross_ref_msg);
+       int ret;
+       struct ldb_result *cross_ref_res;
+       struct ldb_dn *partitions_basedn = samdb_partitions_dn(ldb_ctx, mem_ctx);
+
+       ret = ldb_search_exp_fmt(ldb_ctx, mem_ctx, &cross_ref_res,
+                       partitions_basedn, LDB_SCOPE_SUBTREE, realm_ref_attrs,
+                       "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))",
+                       realm, realm);
+
+       if (ret != LDB_SUCCESS) {
+               DEBUG(3, ("Failed to search to lookup realm(%s): %s\n", realm, ldb_errstring(ldb_ctx)));
+               talloc_free(cross_ref_res);
                return HDB_ERR_NOENTRY;
-       } else if (count > 1) {
-               krb5_warnx(context, "ldb_search: filter: '%s' more than 1 entry: %d", cross_ref_filter, count);
-               krb5_set_error_string(context, "ldb_search: filter: '%s' more than 1 entry: %d", cross_ref_filter, count);
-
-               talloc_free(cross_ref_msg);
+       } else if (cross_ref_res->count == 0 || cross_ref_res->count > 1) {
+               DEBUG(3, ("Failed find a single entry for realm %s: got %d\n", realm, cross_ref_res->count));
+               talloc_free(cross_ref_res);
                return HDB_ERR_NOENTRY;
        }
 
-       realm_dn_str = ldb_msg_find_string(cross_ref_msg[0], "nCName", NULL);
-       realm_dn = ldb_dn_explode(mem_ctx, realm_dn_str);
-
-       count = ldb_search(ldb_ctx, realm_dn, LDB_SCOPE_BASE, "(objectClass=domain)",
-                          realm_attrs, &msg);
        if (pmsg) {
-               *pmsg = talloc_steal(mem_ctx, msg);
-       } else {
-               talloc_free(msg);
-       }
-
-       if (count < 1) {
-               krb5_warnx(context, "ldb_search: dn: %s not found: %d", realm_dn_str, count);
-               krb5_set_error_string(context, "ldb_search: dn: %s not found: %d", realm_dn_str, count);
-               return HDB_ERR_NOENTRY;
-       } else if (count > 1) {
-               krb5_warnx(context, "ldb_search: dn: '%s' more than 1 entry: %d", realm_dn_str, count);
-               krb5_set_error_string(context, "ldb_search: dn: %s more than 1 entry: %d", realm_dn_str, count);
-               return HDB_ERR_NOENTRY;
+               *pmsg = cross_ref_res->msgs;
+               talloc_steal(mem_ctx, cross_ref_res->msgs);
        }
+       talloc_free(cross_ref_res);
 
        return 0;
 }
 
-static krb5_error_code LDB_lookup_spn_alias(krb5_context context, struct ldb_context *ldb_ctx, 
-                                           TALLOC_CTX *mem_ctx,
-                                           const struct ldb_dn *realm_dn,
-                                           const char *alias_from,
-                                           char **alias_to)
-{
-       int i;
-       int count;
-       struct ldb_message **msg;
-       struct ldb_message_element *spnmappings;
-       struct ldb_dn *service_dn = ldb_dn_string_compose(mem_ctx, realm_dn,
-                                               "CN=Directory Service,CN=Windows NT"
-                                               ",CN=Services,CN=Configuration");
-       char *service_dn_str = ldb_dn_linearize(mem_ctx, service_dn);
-       const char *directory_attrs[] = {
-               "sPNMappings", 
-               NULL
-       };
-
-       count = ldb_search(ldb_ctx, service_dn, LDB_SCOPE_BASE, "(objectClass=nTDSService)",
-                          directory_attrs, &msg);
-       talloc_steal(mem_ctx, msg);
-
-       if (count < 1) {
-               krb5_warnx(context, "ldb_search: dn: %s not found: %d", service_dn_str, count);
-               krb5_set_error_string(context, "ldb_search: dn: %s not found: %d", service_dn_str, count);
-               return HDB_ERR_NOENTRY;
-       } else if (count > 1) {
-               krb5_warnx(context, "ldb_search: dn: %s found %d times!", service_dn_str, count);
-               krb5_set_error_string(context, "ldb_search: dn: %s found %d times!", service_dn_str, count);
-               return HDB_ERR_NOENTRY;
-       }
-       
-       spnmappings = ldb_msg_find_element(msg[0], "sPNMappings");
-       if (!spnmappings || spnmappings->num_values == 0) {
-               krb5_warnx(context, "ldb_search: dn: %s no sPNMappings attribute", service_dn_str);
-               krb5_set_error_string(context, "ldb_search: dn: %s no sPNMappings attribute", service_dn_str);
-               return HDB_ERR_NOENTRY;
-       }
-
-       for (i = 0; i < spnmappings->num_values; i++) {
-               char *mapping, *p, *str;
-               mapping = talloc_strdup(mem_ctx, 
-                                       (const char *)spnmappings->values[i].data);
-               if (!mapping) {
-                       krb5_warnx(context, "LDB_lookup_spn_alias: ldb_search: dn: %s did not have an sPNMapping", service_dn_str);
-                       krb5_set_error_string(context, "LDB_lookup_spn_alias: ldb_search: dn: %s did not have an sPNMapping", service_dn_str);
-                       return HDB_ERR_NOENTRY;
-               }
-               
-               /* C string manipulation sucks */
-               
-               p = strchr(mapping, '=');
-               if (!p) {
-                       krb5_warnx(context, "ldb_search: dn: %s sPNMapping malformed: %s", 
-                                  service_dn_str, mapping);
-                       krb5_set_error_string(context, "ldb_search: dn: %s sPNMapping malformed: %s", 
-                                             service_dn_str, mapping);
-                       return HDB_ERR_NOENTRY;
-               }
-               p[0] = '\0';
-               p++;
-               do {
-                       str = p;
-                       p = strchr(p, ',');
-                       if (p) {
-                               p[0] = '\0';
-                               p++;
-                       }
-                       if (strcasecmp(str, alias_from) == 0) {
-                               *alias_to = mapping;
-                               return 0;
-                       }
-               } while (p);
-       }
-       krb5_warnx(context, "LDB_lookup_spn_alias: no alias for service %s applicable", alias_from);
-       return HDB_ERR_NOENTRY;
-}
 
 static krb5_error_code LDB_open(krb5_context context, HDB *db, int flags, mode_t mode)
 {
@@ -732,164 +722,239 @@ static krb5_error_code LDB_rename(krb5_context context, HDB *db, const char *new
        return HDB_ERR_DB_INUSE;
 }
 
-static krb5_error_code LDB_fetch(krb5_context context, HDB *db, unsigned flags,
-                                krb5_const_principal principal,
-                                enum hdb_ent_type ent_type,
-                                hdb_entry *entry)
-{
-       struct ldb_message **msg = NULL;
-       struct ldb_message **realm_msg = NULL;
-       struct ldb_message **realm_fixed_msg = NULL;
-       enum hdb_ldb_ent_type ldb_ent_type;
+static krb5_error_code LDB_fetch_client(krb5_context context, HDB *db, 
+                                       TALLOC_CTX *mem_ctx, 
+                                       krb5_const_principal principal,
+                                       unsigned flags,
+                                       hdb_entry_ex *entry_ex) {
+       NTSTATUS nt_status;
+       char *principal_string;
        krb5_error_code ret;
+       struct ldb_message **msg = NULL;
+       struct ldb_message **realm_ref_msg = NULL;
 
-       const char *realm;
-       const struct ldb_dn *realm_dn;
-       TALLOC_CTX *mem_ctx = talloc_named(NULL, 0, "LDB_fetch context");
-
-       if (!mem_ctx) {
-               krb5_set_error_string(context, "LDB_fetch: talloc_named() failed!");
+       ret = krb5_unparse_name(context, principal, &principal_string);
+       
+       if (ret != 0) {
+               return ret;
+       }
+       
+       nt_status = sam_get_results_principal((struct ldb_context *)db->hdb_db,
+                                             mem_ctx, principal_string, 
+                                             &msg, &realm_ref_msg);
+       free(principal_string);
+       if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
+               return HDB_ERR_NOENTRY;
+       } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_MEMORY)) {
                return ENOMEM;
+       } else if (!NT_STATUS_IS_OK(nt_status)) {
+               return EINVAL;
        }
+       
+       ret = LDB_message2entry(context, db, mem_ctx, 
+                               principal, HDB_LDB_ENT_TYPE_CLIENT,
+                               msg[0], realm_ref_msg[0], entry_ex);
+       return ret;
+}
 
-       realm = krb5_principal_get_realm(context, principal);
+static krb5_error_code LDB_fetch_krbtgt(krb5_context context, HDB *db, 
+                                       TALLOC_CTX *mem_ctx, 
+                                       krb5_const_principal principal,
+                                       unsigned flags,
+                                       hdb_entry_ex *entry_ex)
+{
+       krb5_error_code ret;
+       struct ldb_message **msg = NULL;
+       struct ldb_message **realm_ref_msg = NULL;
+       struct ldb_dn *realm_dn;
 
-       ret = LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db, 
-                              mem_ctx, realm, &realm_msg);
-       if (ret != 0) {
-               krb5_warnx(context, "LDB_fetch: could not find realm");
-               talloc_free(mem_ctx);
+       krb5_principal alloc_principal = NULL;
+       if (principal->name.name_string.len != 2
+           || (strcmp(principal->name.name_string.val[0], KRB5_TGS_NAME) != 0)) {
+               /* Not a krbtgt */
                return HDB_ERR_NOENTRY;
        }
 
-       realm_dn = realm_msg[0]->dn;
-
-       /* Cludge, cludge cludge.  If the realm part of krbtgt/realm,
-        * is in our db, then direct the caller at our primary
-        * krgtgt */
-       
-       switch (ent_type) {
-       case HDB_ENT_TYPE_SERVER:
-               if (principal->name.name_string.len == 2
-                   && (strcmp(principal->name.name_string.val[0], KRB5_TGS_NAME) == 0)
-                   && (LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db,
-                                        mem_ctx, principal->name.name_string.val[1], &realm_fixed_msg) == 0)) {
-                       const char *dnsdomain = ldb_msg_find_string(realm_fixed_msg[0], "dnsDomain", NULL);
-                       char *realm_fixed = strupper_talloc(mem_ctx, dnsdomain);
-                       if (!realm_fixed) {
-                               krb5_set_error_string(context, "strupper_talloc: out of memory");
-                               talloc_free(mem_ctx);
-                               return ENOMEM;
-                       }
-
-                       free(principal->name.name_string.val[1]);
-                       principal->name.name_string.val[1] = strdup(realm_fixed);
-                       talloc_free(realm_fixed);
-                       if (!principal->name.name_string.val[1]) {
-                               krb5_set_error_string(context, "LDB_fetch: strdup() failed!");
-                               talloc_free(mem_ctx);
-                               return ENOMEM;
-                       }
-                       ldb_ent_type = HDB_LDB_ENT_TYPE_KRBTGT;
-               } else {
-                       ldb_ent_type = HDB_LDB_ENT_TYPE_SERVER;
-               }
-               break;
-       case HDB_ENT_TYPE_CLIENT:
-               ldb_ent_type = HDB_LDB_ENT_TYPE_CLIENT;
-               break;
-       case HDB_ENT_TYPE_ANY:
-               ldb_ent_type = HDB_LDB_ENT_TYPE_ANY;
-               break;
-       default:
-               krb5_warnx(context, "LDB_fetch: invalid ent_type specified!");
-               talloc_free(mem_ctx);
+       /* krbtgt case.  Either us or a trusted realm */
+       if ((LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db,
+                             mem_ctx, principal->name.name_string.val[1], &realm_ref_msg) == 0)) {
+               /* us */                
+               /* Cludge, cludge cludge.  If the realm part of krbtgt/realm,
+                * is in our db, then direct the caller at our primary
+                * krgtgt */
+               
+               const char *dnsdomain = ldb_msg_find_attr_as_string(realm_ref_msg[0], "dnsRoot", NULL);
+               char *realm_fixed = strupper_talloc(mem_ctx, dnsdomain);
+               if (!realm_fixed) {
+                       krb5_set_error_string(context, "strupper_talloc: out of memory");
+                       return ENOMEM;
+               }
+               
+               ret = krb5_copy_principal(context, principal, &alloc_principal);
+               if (ret) {
+                       return ret;
+               }
+               free(alloc_principal->name.name_string.val[1]);
+               alloc_principal->name.name_string.val[1] = strdup(realm_fixed);
+               talloc_free(realm_fixed);
+               if (!alloc_principal->name.name_string.val[1]) {
+                       krb5_set_error_string(context, "LDB_fetch: strdup() failed!");
+                       return ENOMEM;
+               }
+               principal = alloc_principal;
+               realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msg[0], "nCName", NULL);
+       } else {
+               /* we should lookup trusted domains */
                return HDB_ERR_NOENTRY;
        }
 
+       realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msg[0], "nCName", NULL);
+       
        ret = LDB_lookup_principal(context, (struct ldb_context *)db->hdb_db, 
                                   mem_ctx, 
-                                  principal, ldb_ent_type, realm_dn, &msg);
+                                  principal, HDB_LDB_ENT_TYPE_KRBTGT, realm_dn, &msg);
+       
+       if (ret != 0) {
+               krb5_warnx(context, "LDB_fetch: could not find principal in DB");
+               krb5_set_error_string(context, "LDB_fetch: could not find principal in DB");
+               return ret;
+       }
 
+       ret = LDB_message2entry(context, db, mem_ctx, 
+                               principal, HDB_LDB_ENT_TYPE_KRBTGT, 
+                               msg[0], realm_ref_msg[0], entry_ex);
        if (ret != 0) {
-               char *alias_from = principal->name.name_string.val[0];
-               char *alias_to;
-               Principal alias_principal;
+               krb5_warnx(context, "LDB_fetch: message2entry failed"); 
+       }
+       return ret;
+}
+
+static krb5_error_code LDB_fetch_server(krb5_context context, HDB *db, 
+                                       TALLOC_CTX *mem_ctx, 
+                                       krb5_const_principal principal,
+                                       unsigned flags,
+                                       hdb_entry_ex *entry_ex)
+{
+       krb5_error_code ret;
+       const char *realm;
+       struct ldb_message **msg = NULL;
+       struct ldb_message **realm_ref_msg = NULL;
+       struct ldb_dn *partitions_basedn = samdb_partitions_dn(db->hdb_db, mem_ctx);
+       if (principal->name.name_string.len >= 2) {
+               /* 'normal server' case */
+               int ldb_ret;
+               NTSTATUS nt_status;
+               struct ldb_dn *user_dn, *domain_dn;
+               char *principal_string;
                
-               /* Try again with a servicePrincipal alias */
-               if (ent_type != HDB_LDB_ENT_TYPE_SERVER && ent_type != HDB_LDB_ENT_TYPE_ANY) {
-                       talloc_free(mem_ctx);
+               ret = krb5_unparse_name_flags(context, principal, 
+                                             KRB5_PRINCIPAL_UNPARSE_NO_REALM, 
+                                             &principal_string);
+               if (ret != 0) {
                        return ret;
                }
-               if (principal->name.name_string.len < 2) {
-                       krb5_warnx(context, "LDB_fetch: could not find principal in DB, alias not applicable");
-                       krb5_set_error_string(context, "LDB_fetch: could not find principal in DB, alias not applicable");
-                       talloc_free(mem_ctx);
-                       return ret;
+               
+               /* At this point we may find the host is known to be
+                * in a different realm, so we should generate a
+                * referral instead */
+               nt_status = crack_service_principal_name((struct ldb_context *)db->hdb_db,
+                                                        mem_ctx, principal_string, 
+                                                        &user_dn, &domain_dn);
+               free(principal_string);
+               
+               if (!NT_STATUS_IS_OK(nt_status)) {
+                       return HDB_ERR_NOENTRY;
                }
-
-               /* Look for the list of aliases */
-               ret = LDB_lookup_spn_alias(context, 
-                                          (struct ldb_context *)db->hdb_db, mem_ctx, 
-                                          realm_dn, alias_from, 
-                                          &alias_to);
-               if (ret != 0) {
-                       talloc_free(mem_ctx);
-                       return ret;
+               
+               ldb_ret = gendb_search_dn((struct ldb_context *)db->hdb_db,
+                                         mem_ctx, user_dn, &msg, user_attrs);
+               
+               if (ldb_ret != 1) {
+                       return HDB_ERR_NOENTRY;
                }
-
-               ret = copy_Principal(principal, &alias_principal);
-               if (ret != 0) {
-                       krb5_warnx(context, "LDB_fetch: could not copy principal");
-                       krb5_set_error_string(context, "LDB_fetch: could not copy principal");
-                       talloc_free(mem_ctx);
-                       return ret;
+               
+               ldb_ret = gendb_search((struct ldb_context *)db->hdb_db,
+                                      mem_ctx, partitions_basedn, &realm_ref_msg, realm_ref_attrs, 
+                                      "ncName=%s", ldb_dn_get_linearized(domain_dn));
+               
+               if (ldb_ret != 1) {
+                       return HDB_ERR_NOENTRY;
                }
+               
+       } else {
+               struct ldb_dn *realm_dn;
+               /* server as client principal case, but we must not lookup userPrincipalNames */
 
-               /* ooh, very nasty playing around in the Principal... */
-               free(alias_principal.name.name_string.val[0]);
-               alias_principal.name.name_string.val[0] = strdup(alias_to);
-               if (!alias_principal.name.name_string.val[0]) {
-                       krb5_warnx(context, "LDB_fetch: strdup() failed");
-                       krb5_set_error_string(context, "LDB_fetch: strdup() failed");
-                       ret = ENOMEM;
-                       talloc_free(mem_ctx);
-                       free_Principal(&alias_principal);
-                       return ret;
+               realm = krb5_principal_get_realm(context, principal);
+               
+               ret = LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db, 
+                                      mem_ctx, realm, &realm_ref_msg);
+               if (ret != 0) {
+                       return HDB_ERR_NOENTRY;
                }
-
+               
+               realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msg[0], "nCName", NULL);
+               
                ret = LDB_lookup_principal(context, (struct ldb_context *)db->hdb_db, 
                                           mem_ctx, 
-                                          &alias_principal, ent_type, realm_dn, &msg);
-               free_Principal(&alias_principal);
-
+                                          principal, HDB_LDB_ENT_TYPE_SERVER, realm_dn, &msg);
+               
                if (ret != 0) {
-                       krb5_warnx(context, "LDB_fetch: could not find alias principal in DB");
-                       krb5_set_error_string(context, "LDB_fetch: could not find alias principal in DB");
-                       talloc_free(mem_ctx);
                        return ret;
                }
+       }
 
+       ret = LDB_message2entry(context, db, mem_ctx, 
+                               principal, HDB_LDB_ENT_TYPE_SERVER,
+                               msg[0], realm_ref_msg[0], entry_ex);
+       if (ret != 0) {
+               krb5_warnx(context, "LDB_fetch: message2entry failed"); 
        }
-       if (ret == 0) {
-               ret = LDB_message2entry(context, db, mem_ctx, 
-                                       principal, ldb_ent_type, 
-                                       realm_msg[0], msg[0], entry);
-               if (ret != 0) {
-                       krb5_warnx(context, "LDB_fetch: message2entry failed\n");       
-               }
+
+       return ret;
+}
+                       
+static krb5_error_code LDB_fetch(krb5_context context, HDB *db, 
+                                krb5_const_principal principal,
+                                unsigned flags,
+                                hdb_entry_ex *entry_ex)
+{
+       krb5_error_code ret = HDB_ERR_NOENTRY;
+
+       TALLOC_CTX *mem_ctx = talloc_named(db, 0, "LDB_fetch context");
+
+       if (!mem_ctx) {
+               krb5_set_error_string(context, "LDB_fetch: talloc_named() failed!");
+               return ENOMEM;
        }
 
+       if (flags & HDB_F_GET_CLIENT) {
+               ret = LDB_fetch_client(context, db, mem_ctx, principal, flags, entry_ex);
+               if (ret != HDB_ERR_NOENTRY) goto done;
+       }
+       if (flags & HDB_F_GET_SERVER) {
+               ret = LDB_fetch_server(context, db, mem_ctx, principal, flags, entry_ex);
+               if (ret != HDB_ERR_NOENTRY) goto done;
+               ret = LDB_fetch_krbtgt(context, db, mem_ctx, principal, flags, entry_ex);
+               if (ret != HDB_ERR_NOENTRY) goto done;
+       }
+       if (flags & HDB_F_GET_KRBTGT) {
+               ret = LDB_fetch_krbtgt(context, db, mem_ctx, principal, flags, entry_ex);
+               if (ret != HDB_ERR_NOENTRY) goto done;
+       }
+
+done:
        talloc_free(mem_ctx);
        return ret;
 }
 
-static krb5_error_code LDB_store(krb5_context context, HDB *db, unsigned flags, hdb_entry *entry)
+static krb5_error_code LDB_store(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry)
 {
        return HDB_ERR_DB_INUSE;
 }
 
-static krb5_error_code LDB_remove(krb5_context context, HDB *db, hdb_entry *entry)
+static krb5_error_code LDB_remove(krb5_context context, HDB *db, krb5_const_principal principal)
 {
        return HDB_ERR_DB_INUSE;
 }
@@ -899,14 +964,17 @@ struct hdb_ldb_seq {
        int index;
        int count;
        struct ldb_message **msgs;
-       struct ldb_message **realm_msgs;
+       struct ldb_message **realm_ref_msgs;
 };
 
-static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hdb_entry *entry)
+static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry)
 {
        krb5_error_code ret;
-       struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_openp;
+       struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_dbc;
        TALLOC_CTX *mem_ctx;
+       hdb_entry_ex entry_ex;
+       memset(&entry_ex, '\0', sizeof(entry_ex));
+
        if (!priv) {
                return HDB_ERR_NOENTRY;
        }
@@ -921,14 +989,15 @@ static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hd
        if (priv->index < priv->count) {
                ret = LDB_message2entry(context, db, mem_ctx, 
                                        NULL, HDB_LDB_ENT_TYPE_ANY, 
-                                       priv->realm_msgs[0], priv->msgs[priv->index++], entry);
+                                       priv->msgs[priv->index++], 
+                                       priv->realm_ref_msgs[0], entry);
        } else {
                ret = HDB_ERR_NOENTRY;
        }
 
        if (ret != 0) {
                talloc_free(priv);
-               db->hdb_openp = NULL;
+               db->hdb_dbc = NULL;
        } else {
                talloc_free(mem_ctx);
        }
@@ -937,20 +1006,21 @@ static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hd
 }
 
 static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flags,
-                                       hdb_entry *entry)
+                                       hdb_entry_ex *entry)
 {
        struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
-       struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_openp;
+       struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_dbc;
        char *realm;
        struct ldb_dn *realm_dn = NULL;
-       struct ldb_message **msgs = NULL;
-       struct ldb_message **realm_msgs = NULL;
+       struct ldb_result *res = NULL;
+       struct ldb_message **realm_ref_msgs = NULL;
        krb5_error_code ret;
        TALLOC_CTX *mem_ctx;
+       int lret;
 
        if (priv) {
                talloc_free(priv);
-               db->hdb_openp = 0;
+               db->hdb_dbc = NULL;
        }
 
        priv = (struct hdb_ldb_seq *) talloc(db, struct hdb_ldb_seq);
@@ -962,7 +1032,7 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
        priv->ctx = ldb_ctx;
        priv->index = 0;
        priv->msgs = NULL;
-       priv->realm_msgs = NULL;
+       priv->realm_ref_msgs = NULL;
        priv->count = 0;
 
        mem_ctx = talloc_named(priv, 0, "LDB_firstkey context");
@@ -979,7 +1049,7 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
        }
                
        ret = LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db, 
-                              mem_ctx, realm, &realm_msgs);
+                              mem_ctx, realm, &realm_ref_msgs);
 
        free(realm);
 
@@ -989,30 +1059,30 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
                return HDB_ERR_NOENTRY;
        }
 
-       realm_dn = realm_msgs[0]->dn;
-
-       priv->realm_msgs = talloc_steal(priv, realm_msgs);
+       realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msgs[0], "nCName", NULL);
 
-       krb5_warnx(context, "LDB_firstkey: realm ok\n");
+       priv->realm_ref_msgs = talloc_steal(priv, realm_ref_msgs);
 
-       priv->count = ldb_search(ldb_ctx, realm_dn,
+       lret = ldb_search(ldb_ctx, realm_dn,
                                 LDB_SCOPE_SUBTREE, "(objectClass=user)",
-                                krb5_attrs, &msgs);
+                                user_attrs, &res);
 
-       priv->msgs = talloc_steal(priv, msgs);
-
-       if (priv->count <= 0) {
+       if (lret != LDB_SUCCESS) {
                talloc_free(priv);
                return HDB_ERR_NOENTRY;
        }
 
-       db->hdb_openp = priv;
+       priv->count = res->count;
+       priv->msgs = talloc_steal(priv, res->msgs);
+       talloc_free(res);
+
+       db->hdb_dbc = priv;
 
        ret = LDB_seq(context, db, flags, entry);
-       
+
        if (ret != 0) {
                talloc_free(priv);
-               db->hdb_openp = NULL;
+               db->hdb_dbc = NULL;
        } else {
                talloc_free(mem_ctx);
        }
@@ -1020,7 +1090,7 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
 }
 
 static krb5_error_code LDB_nextkey(krb5_context context, HDB *db, unsigned flags,
-                                       hdb_entry *entry)
+                                  hdb_entry_ex *entry)
 {
        return LDB_seq(context, db, flags, entry);
 }
@@ -1031,28 +1101,50 @@ static krb5_error_code LDB_destroy(krb5_context context, HDB *db)
        return 0;
 }
 
-krb5_error_code hdb_ldb_create(TALLOC_CTX *mem_ctx, 
-                              krb5_context context, struct HDB **db, const char *arg)
+/* This interface is to be called by the KDC, which is expecting Samba
+ * calling conventions.  It is also called by a wrapper
+ * (hdb_ldb_create) from the kpasswdd -> krb5 -> keytab_hdb -> hdb
+ * code */
+
+NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, 
+                           struct loadparm_context *lp_ctx,
+                           krb5_context context, struct HDB **db, const char *arg)
 {
+       NTSTATUS nt_status;
+       struct auth_session_info *session_info;
        *db = talloc(mem_ctx, HDB);
        if (!*db) {
                krb5_set_error_string(context, "malloc: out of memory");
-               return ENOMEM;
+               return NT_STATUS_NO_MEMORY;
        }
 
        (*db)->hdb_master_key_set = 0;
        (*db)->hdb_db = NULL;
 
+       nt_status = auth_system_session_info(*db, lp_ctx, &session_info);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
+       }
+       
+       /* The idea here is very simple.  Using Kerberos to
+        * authenticate the KDC to the LDAP server is higly likely to
+        * be circular.
+        *
+        * In future we may set this up to use EXERNAL and SSL
+        * certificates, for now it will almost certainly be NTLMSSP
+       */
+       
+       cli_credentials_set_kerberos_state(session_info->credentials, 
+                                          CRED_DONT_USE_KERBEROS);
+
        /* Setup the link to LDB */
-       (*db)->hdb_db = samdb_connect(db, system_session(db));
+       (*db)->hdb_db = samdb_connect(*db, lp_ctx, session_info);
        if ((*db)->hdb_db == NULL) {
-               krb5_warnx(context, "hdb_ldb_create: samdb_connect failed!");
-               krb5_set_error_string(context, "samdb_connect failed!");
-               talloc_free(*db);
-               return HDB_ERR_NOENTRY;
+               DEBUG(1, ("hdb_ldb_create: Cannot open samdb for KDC backend!"));
+               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
        }
 
-       (*db)->hdb_openp = 0;
+       (*db)->hdb_dbc = NULL;
        (*db)->hdb_open = LDB_open;
        (*db)->hdb_close = LDB_close;
        (*db)->hdb_fetch = LDB_fetch;
@@ -1070,5 +1162,18 @@ krb5_error_code hdb_ldb_create(TALLOC_CTX *mem_ctx,
        (*db)->hdb__del = NULL;
        (*db)->hdb_destroy = LDB_destroy;
 
-       return 0;
+       return NT_STATUS_OK;
+}
+
+krb5_error_code hdb_ldb_create(krb5_context context, struct HDB **db, const char *arg)
+{
+       NTSTATUS nt_status;
+       /* The global kdc_mem_ctx and kdc_lp_ctx, Disgusting, ugly hack, but it means one less private hook */
+       nt_status = kdc_hdb_ldb_create(kdc_mem_ctx, kdc_lp_ctx, 
+                                      context, db, arg);
+
+       if (NT_STATUS_IS_OK(nt_status)) {
+               return 0;
+       }
+       return EINVAL;
 }