Only allow the trust in the correct direction (per the flags).
[kai/samba.git] / source4 / kdc / hdb-ldb.c
index 9c7b1f6457a85dbec24008f67de1bfb435220d6f..ef3a0bcb8ac0901ea413cebef7daa68dc4a0909b 100644 (file)
 
 #include "includes.h"
 #include "system/time.h"
-#include "kdc.h"
 #include "dsdb/common/flags.h"
-#include "hdb.h"
-#include "krb5_locl.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "librpc/gen_ndr/lsa.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
 #include "events/events.h"
+#include "kdc/kdc.h"
+#include "lib/crypto/md4.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 };
+  HDB_LDB_ENT_TYPE_KRBTGT, HDB_LDB_ENT_TYPE_TRUST, HDB_LDB_ENT_TYPE_ANY };
+
+enum trust_direction {
+       UNKNOWN = 0,
+       INBOUND = LSA_TRUST_DIRECTION_INBOUND, 
+       OUTBOUND = LSA_TRUST_DIRECTION_OUTBOUND
+};
 
 static const char *realm_ref_attrs[] = {
        "nCName", 
@@ -62,6 +68,18 @@ static const char *realm_ref_attrs[] = {
        NULL
 };
 
+static const char *trust_attrs[] = {
+       "trustPartner",
+       "trustAuthIncoming",
+       "trustAuthOutgoing",
+       "whenCreated",
+       "msDS-SupportedEncryptionTypes",
+       "trustAttributes",
+       "trustDirection",
+       "trustType",
+       NULL
+};
+
 static KerberosTime ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, const char *attr, KerberosTime default_val)
 {
     const char *tmp;
@@ -192,9 +210,11 @@ static krb5_error_code LDB_message2entry_keys(krb5_context context,
        struct samr_Password *hash;
        const struct ldb_val *sc_val;
        struct supplementalCredentialsBlob scb;
-       struct supplementalCredentialsPackage *scp = NULL;
+       struct supplementalCredentialsPackage *scpk = NULL;
+       bool newer_keys = false;
        struct package_PrimaryKerberosBlob _pkb;
        struct package_PrimaryKerberosCtr3 *pkb3 = NULL;
+       struct package_PrimaryKerberosCtr4 *pkb4 = NULL;
        uint32_t i;
        uint32_t allocated_keys = 0;
 
@@ -223,35 +243,48 @@ static krb5_error_code LDB_message2entry_keys(krb5_context context,
                        goto out;
                }
 
-               for (i=0; i < scb.sub.num_packages; i++) {
-                       if (scb.sub.packages[i].unknown1 != 0x00000001) {
-                               continue;
-                       }
-
-                       if (strcmp("Primary:Kerberos", scb.sub.packages[i].name) != 0) {
-                               continue;
-                       }
+               if (scb.sub.signature != SUPPLEMENTAL_CREDENTIALS_SIGNATURE) {
+                       NDR_PRINT_DEBUG(supplementalCredentialsBlob, &scb);
+                       ret = EINVAL;
+                       goto out;
+               }
 
-                       if (!scb.sub.packages[i].data || !scb.sub.packages[i].data[0]) {
-                               continue;
+               for (i=0; i < scb.sub.num_packages; i++) {
+                       if (strcmp("Primary:Kerberos-Newer-Keys", scb.sub.packages[i].name) == 0) {
+                               scpk = &scb.sub.packages[i];
+                               if (!scpk->data || !scpk->data[0]) {
+                                       scpk = NULL;
+                                       continue;
+                               }
+                               newer_keys = true;
+                               break;
+                       } else if (strcmp("Primary:Kerberos", scb.sub.packages[i].name) == 0) {
+                               scpk = &scb.sub.packages[i];
+                               if (!scpk->data || !scpk->data[0]) {
+                                       scpk = NULL;
+                               }
+                               /*
+                                * we don't break here in hope to find
+                                * a Kerberos-Newer-Keys package
+                                */
                        }
-
-                       scp = &scb.sub.packages[i];
-                       break;
                }
        }
-       /* Primary:Kerberos element of supplementalCredentials */
-       if (scp) {
+       /*
+        * Primary:Kerberos-Newer-Keys or Primary:Kerberos element
+        * of supplementalCredentials
+        */
+       if (scpk) {
                DATA_BLOB blob;
 
-               blob = strhex_to_data_blob(scp->data);
+               blob = strhex_to_data_blob(scpk->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 */
+               /* we cannot use ndr_pull_struct_blob_all() here, as w2k and w2k3 add padding bytes */
                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)) {
@@ -261,16 +294,27 @@ static krb5_error_code LDB_message2entry_keys(krb5_context context,
                        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");
+               if (newer_keys && _pkb.version != 4) {
+                       krb5_set_error_string(context, "LDB_message2entry_keys: Primary:Kerberos-Newer-Keys not version 4");
+                       krb5_warnx(context, "LDB_message2entry_keys: Primary:Kerberos-Newer-Keys not version 4");
                        ret = EINVAL;
                        goto out;
                }
-               
-               pkb3 = &_pkb.ctr.ctr3;
 
-               allocated_keys += pkb3->num_keys;
+               if (!newer_keys && _pkb.version != 3) {
+                       krb5_set_error_string(context, "LDB_message2entry_keys: could not parse Primary:Kerberos not version 3");
+                       krb5_warnx(context, "LDB_message2entry_keys: could not parse Primary:Kerberos not version 3");
+                       ret = EINVAL;
+                       goto out;
+               }
+
+               if (_pkb.version == 4) {
+                       pkb4 = &_pkb.ctr.ctr4;
+                       allocated_keys += pkb4->num_keys;
+               } else if (_pkb.version == 3) {
+                       pkb3 = &_pkb.ctr.ctr3;
+                       allocated_keys += pkb3->num_keys;
+               }
        }
 
        if (allocated_keys == 0) {
@@ -306,7 +350,70 @@ static krb5_error_code LDB_message2entry_keys(krb5_context context,
                entry_ex->entry.keys.len++;
        }
 
-       if (pkb3) {
+       if (pkb4) {
+               for (i=0; i < pkb4->num_keys; i++) {
+                       bool use = true;
+                       Key key;
+
+                       if (!pkb4->keys[i].value) continue;
+
+                       if (userAccountControl & UF_USE_DES_KEY_ONLY) {
+                               switch (pkb4->keys[i].keytype) {
+                               case ENCTYPE_DES_CBC_CRC:
+                               case ENCTYPE_DES_CBC_MD5:
+                                       break;
+                               default:
+                                       use = false;
+                                       break;
+                               }
+                       }
+
+                       if (!use) continue;
+
+                       key.mkvno = 0;
+                       key.salt = NULL;
+
+                       if (pkb4->salt.string) {
+                               DATA_BLOB salt;
+
+                               salt = data_blob_string_const(pkb4->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;
+                               }
+                       }
+
+                       /* 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);
+                       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++;
+               }
+       } else if (pkb3) {
                for (i=0; i < pkb3->num_keys; i++) {
                        bool use = true;
                        Key key;
@@ -327,6 +434,7 @@ static krb5_error_code LDB_message2entry_keys(krb5_context context,
                        if (!use) continue;
 
                        key.mkvno = 0;
+                       key.salt = NULL;
 
                        if (pkb3->salt.string) {
                                DATA_BLOB salt;
@@ -587,6 +695,187 @@ out:
        return ret;
 }
 
+/*
+ * Construct an hdb_entry from a directory entry.
+ */
+static krb5_error_code LDB_trust_message2entry(krb5_context context, HDB *db, 
+                                              struct loadparm_context *lp_ctx,
+                                              TALLOC_CTX *mem_ctx, krb5_const_principal principal,
+                                              enum trust_direction direction,
+                                              struct ldb_message *msg,
+                                              hdb_entry_ex *entry_ex)
+{
+       
+       const char *dnsdomain;
+       char *realm;
+       char *strdup_realm;
+       DATA_BLOB password_utf16;
+       struct samr_Password password_hash;
+       const struct ldb_val *password_val;
+       struct trustAuthInOutBlob password_blob;
+       struct hdb_ldb_private *private;
+
+       enum ndr_err_code ndr_err;
+       int i, ret, trust_direction_flags;
+
+       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);
+
+       talloc_set_destructor(private, hdb_ldb_destrutor);
+
+       entry_ex->ctx = private;
+       entry_ex->free_entry = hdb_ldb_free_entry;
+
+       /* use 'whenCreated' */
+       entry_ex->entry.created_by.time = ldb_msg_find_krb5time_ldap_time(msg, "whenCreated", 0);
+       /* use '???' */
+       entry_ex->entry.created_by.principal = NULL;
+
+       entry_ex->entry.valid_start = NULL;
+
+       trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection", 0);
+
+       if (direction == INBOUND) {
+               realm = strupper_talloc(mem_ctx, lp_realm(lp_ctx));
+               password_val = ldb_msg_find_ldb_val(msg, "trustAuthIncoming");
+
+       } else { /* OUTBOUND */
+               dnsdomain = ldb_msg_find_attr_as_string(msg, "trustPartner", NULL);
+               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_all(password_val, mem_ctx, private->iconv_convenience, &password_blob,
+                                          (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               ret = EINVAL;
+               goto out;
+       }
+
+       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;
+               }
+       }
+       entry_ex->entry.keys.len = 0;
+       entry_ex->entry.keys.val = NULL;
+
+       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_MD5,
+                                        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++;
+       }
+               
+       ret = copy_Principal(principal, entry_ex->entry.principal);
+       if (ret) {
+               krb5_clear_error_string(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() */
+       strdup_realm = strdup(realm);
+       if (!strdup_realm) {
+               ret = ENOMEM;
+               krb5_clear_error_string(context);
+               goto out;
+       }
+       free(*krb5_princ_realm(context, entry_ex->entry.principal));
+       krb5_princ_set_realm(context, entry_ex->entry.principal, &strdup_realm);
+       
+       entry_ex->entry.flags = int2HDBFlags(0);
+       entry_ex->entry.flags.immutable = 1;
+       entry_ex->entry.flags.invalid = 0;
+       entry_ex->entry.flags.server = 1;
+       entry_ex->entry.flags.require_preauth = 1;
+
+       entry_ex->entry.pw_end = NULL;
+                       
+       entry_ex->entry.max_life = NULL;
+
+       entry_ex->entry.max_renew = NULL;
+
+       entry_ex->entry.generation = NULL;
+
+       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;
+       }
+       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 < 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 = NULL;
+       private->samdb = (struct ldb_context *)db->hdb_db;
+       
+out:
+       if (ret != 0) {
+               /* 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;
+
+}
+
 static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_context *ldb_ctx,                                         
                                            TALLOC_CTX *mem_ctx,
                                            krb5_const_principal principal,
@@ -621,8 +910,7 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
 
        switch (ent_type) {
        case HDB_LDB_ENT_TYPE_CLIENT:
-               /* Can't happen */
-               return EINVAL;
+       case HDB_LDB_ENT_TYPE_TRUST:
        case HDB_LDB_ENT_TYPE_ANY:
                /* Can't happen */
                return EINVAL;
@@ -657,6 +945,40 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
        return 0;
 }
 
+static krb5_error_code LDB_lookup_trust(krb5_context context, struct ldb_context *ldb_ctx,                                     
+                                       TALLOC_CTX *mem_ctx,
+                                       const char *realm,
+                                       struct ldb_dn *realm_dn,
+                                       struct ldb_message ***pmsg)
+{
+       int lret;
+       char *filter = NULL;
+       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) {
+               krb5_set_error_string(context, "talloc_asprintf: out of memory");
+               return ENOMEM;
+       }
+
+       lret = ldb_search(ldb_ctx, ldb_get_default_basedn(ldb_ctx), LDB_SCOPE_SUBTREE, filter, attrs, &res);
+
+       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;
+       talloc_free(res);
+       return 0;
+}
+
 static krb5_error_code LDB_lookup_realm(krb5_context context, struct ldb_context *ldb_ctx, 
                                        TALLOC_CTX *mem_ctx,
                                        const char *realm,
@@ -765,8 +1087,10 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context context, HDB *db,
 {
        krb5_error_code ret;
        struct ldb_message **msg = NULL;
-       struct ldb_message **realm_ref_msg = NULL;
+       struct ldb_message **realm_ref_msg_1 = NULL;
+       struct ldb_message **realm_ref_msg_2 = NULL;
        struct ldb_dn *realm_dn;
+       const char *realm;
 
        krb5_principal alloc_principal = NULL;
        if (principal->name.name_string.len != 2
@@ -776,14 +1100,18 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context context, HDB *db,
        }
 
        /* 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)) {
+                             mem_ctx, principal->realm, &realm_ref_msg_1) == 0)
+           && (LDB_lookup_realm(context, (struct ldb_context *)db->hdb_db,
+                                mem_ctx, principal->name.name_string.val[1], &realm_ref_msg_2) == 0)
+           && (ldb_dn_compare(realm_ref_msg_1[0]->dn, realm_ref_msg_1[0]->dn) == 0)) {
                /* us */                
                /* Cludge, cludge cludge.  If the realm part of krbtgt/realm,
                 * is in our db, then direct the caller at our primary
-                * krgtgt */
+                * krbtgt */
                
-               const char *dnsdomain = ldb_msg_find_attr_as_string(realm_ref_msg[0], "dnsRoot", NULL);
+               const char *dnsdomain = ldb_msg_find_attr_as_string(realm_ref_msg_1[0], "dnsRoot", NULL);
                char *realm_fixed = strupper_talloc(mem_ctx, dnsdomain);
                if (!realm_fixed) {
                        krb5_set_error_string(context, "strupper_talloc: out of memory");
@@ -803,31 +1131,69 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context context, HDB *db,
                        return ENOMEM;
                }
                principal = alloc_principal;
-               realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msg[0], "nCName", NULL);
+               realm_dn = samdb_result_dn((struct ldb_context *)db->hdb_db, mem_ctx, realm_ref_msg_1[0], "nCName", NULL);
+               
+               ret = LDB_lookup_principal(context, (struct ldb_context *)db->hdb_db, 
+                                          mem_ctx, 
+                                          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_1[0], entry_ex);
+               if (ret != 0) {
+                       krb5_warnx(context, "LDB_fetch: message2entry failed"); 
+               }
+               return ret;
+
        } else {
-               /* we should lookup trusted domains */
-               return HDB_ERR_NOENTRY;
-       }
+               enum trust_direction direction = UNKNOWN;
 
-       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, 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");
+               struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(db->hdb_db, "loadparm"), struct loadparm_context);
+               /* Either an inbound or outbound trust */
+
+               if (strcasecmp(lp_realm(lp_ctx), principal->realm) == 0) {
+                       /* look for inbound trust */
+                       direction = INBOUND;
+                       realm = principal->name.name_string.val[1];
+               }
+
+               if (strcasecmp(lp_realm(lp_ctx), principal->name.name_string.val[1]) == 0) {
+                       /* look for outbound trust */
+                       direction = OUTBOUND;
+                       realm = principal->realm;
+               }
+
+               /* Trusted domains are under CN=system */
+               
+               ret = LDB_lookup_trust(context, (struct ldb_context *)db->hdb_db, 
+                                      mem_ctx, 
+                                      realm, 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_trust_message2entry(context, db, lp_ctx, mem_ctx, 
+                                             principal, direction, 
+                                             msg[0], entry_ex);
+               if (ret != 0) {
+                       krb5_warnx(context, "LDB_fetch: message2entry failed"); 
+               }
                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) {
-               krb5_warnx(context, "LDB_fetch: message2entry failed"); 
+               
+               /* we should lookup trusted domains */
+               return HDB_ERR_NOENTRY;
        }
-       return ret;
+
 }
 
 static krb5_error_code LDB_fetch_server(krb5_context context, HDB *db, 
@@ -934,10 +1300,13 @@ static krb5_error_code LDB_fetch(krb5_context context, HDB *db,
                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;
+               /* krbtgt fits into this situation for trusted realms, and for resolving different versions of our own realm name */
                ret = LDB_fetch_krbtgt(context, db, mem_ctx, principal, flags, entry_ex);
                if (ret != HDB_ERR_NOENTRY) goto done;
+
+               /* We return 'no entry' if it does not start with krbtgt/, so move to the common case quickly */
+               ret = LDB_fetch_server(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);