s4-drsuapi: Fix a const warning
[ddiss/samba.git] / source4 / dsdb / samdb / cracknames.c
index b9333e451bade34a437f63b53f749673cb0977d0..504f1b2deb4ba75c3c3a2f5d0f0204c364345969 100644 (file)
@@ -1,49 +1,51 @@
 /* 
    Unix SMB/CIFS implementation.
 
-   endpoint server for the drsuapi pipe
+   crachnames implementation for the drsuapi pipe
    DsCrackNames()
 
    Copyright (C) Stefan Metzmacher 2004
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005
-   
+   Copyright (C) Matthieu Patou <mat@matws.net> 2012
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "librpc/gen_ndr/drsuapi.h"
-#include "rpc_server/common/common.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "system/kerberos.h"
+#include "lib/events/events.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "auth/kerberos/kerberos.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "auth/auth.h"
-#include "util/util_ldb.h"
+#include "../lib/util/util_ldb.h"
 #include "dsdb/samdb/samdb.h"
+#include "dsdb/common/util.h"
 #include "param/param.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                   struct smb_krb5_context *smb_krb5_context,
-                                  uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
+                                  uint32_t format_flags, enum drsuapi_DsNameFormat format_offered,
+                                  enum drsuapi_DsNameFormat format_desired,
                                   struct ldb_dn *name_dn, const char *name, 
                                   const char *domain_filter, const char *result_filter, 
-                                  struct drsuapi_DsNameInfo1 *info1);
+                                  struct drsuapi_DsNameInfo1 *info1, int scope, struct ldb_dn *search_dn);
 static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
-                                       uint32_t format_offered, uint32_t format_desired,
+                                       enum drsuapi_DsNameFormat format_offered,
+                                       enum drsuapi_DsNameFormat format_desired,
                                        struct ldb_dn *name_dn, const char *name, 
                                        struct drsuapi_DsNameInfo1 *info1);
 
@@ -54,22 +56,22 @@ static WERROR dns_domain_from_principal(TALLOC_CTX *mem_ctx, struct smb_krb5_con
        krb5_error_code ret;
        krb5_principal principal;
        /* perhaps it's a principal with a realm, so return the right 'domain only' response */
-       char **realm;
+       const char *realm;
        ret = krb5_parse_name_flags(smb_krb5_context->krb5_context, name, 
-                                   KRB5_PRINCIPAL_PARSE_MUST_REALM, &principal);
+                                   KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &principal);
        if (ret) {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                return WERR_OK;
        }
 
        /* This isn't an allocation assignemnt, so it is free'ed with the krb5_free_principal */
-       realm = krb5_princ_realm(smb_krb5_context->krb5_context, principal);
-       
-       info1->dns_domain_name  = talloc_strdup(mem_ctx, *realm);
+       realm = smb_krb5_principal_get_realm(smb_krb5_context->krb5_context, principal);
+
+       info1->dns_domain_name  = talloc_strdup(mem_ctx, realm);
        krb5_free_principal(smb_krb5_context->krb5_context, principal);
-       
+
        W_ERROR_HAVE_NO_MEMORY(info1->dns_domain_name);
-       
+
        info1->status = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
        return WERR_OK;
 }              
@@ -79,7 +81,7 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
                                                      const char *alias_from,
                                                      char **alias_to)
 {
-       int i;
+       unsigned int i;
        int ret;
        struct ldb_result *res;
        struct ldb_message_element *spnmappings;
@@ -98,7 +100,7 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
        }
 
        service_dn = ldb_dn_new(tmp_ctx, ldb_ctx, "CN=Directory Service,CN=Windows NT,CN=Services");
-       if ( ! ldb_dn_add_base(service_dn, samdb_config_dn(ldb_ctx))) {
+       if ( ! ldb_dn_add_base(service_dn, ldb_get_config_basedn(ldb_ctx))) {
                return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
        }
        service_dn_str = ldb_dn_alloc_linearized(tmp_ctx, service_dn);
@@ -106,25 +108,24 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
                return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
        }
 
-       ret = ldb_search(ldb_ctx, service_dn, LDB_SCOPE_BASE, "(objectClass=nTDSService)",
-                        directory_attrs, &res);
+       ret = ldb_search(ldb_ctx, tmp_ctx, &res, service_dn, LDB_SCOPE_BASE,
+                        directory_attrs, "(objectClass=nTDSService)");
 
        if (ret != LDB_SUCCESS && ret != LDB_ERR_NO_SUCH_OBJECT) {
-               DEBUG(1, ("ldb_search: dn: %s not found: %s", service_dn_str, ldb_errstring(ldb_ctx)));
+               DEBUG(1, ("ldb_search: dn: %s not found: %s\n", service_dn_str, ldb_errstring(ldb_ctx)));
                return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
        } else if (ret == LDB_ERR_NO_SUCH_OBJECT) {
-               DEBUG(1, ("ldb_search: dn: %s not found", service_dn_str));
+               DEBUG(1, ("ldb_search: dn: %s not found\n", service_dn_str));
                return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
        } else if (res->count != 1) {
                talloc_free(res);
-               DEBUG(1, ("ldb_search: dn: %s not found", service_dn_str));
+               DEBUG(1, ("ldb_search: dn: %s not found\n", service_dn_str));
                return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
        }
-       talloc_steal(tmp_ctx, res);
-       
+
        spnmappings = ldb_msg_find_element(res->msgs[0], "sPNMappings");
        if (!spnmappings || spnmappings->num_values == 0) {
-               DEBUG(1, ("ldb_search: dn: %s no sPNMappings attribute", service_dn_str));
+               DEBUG(1, ("ldb_search: dn: %s no sPNMappings attribute\n", service_dn_str));
                talloc_free(tmp_ctx);
                return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
        }
@@ -138,9 +139,9 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
                        talloc_free(tmp_ctx);
                        return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                }
-               
+
                /* C string manipulation sucks */
-               
+
                p = strchr(mapping, '=');
                if (!p) {
                        DEBUG(1, ("ldb_search: dn: %s sPNMapping malformed: %s\n", 
@@ -177,76 +178,74 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
 
 static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                  struct smb_krb5_context *smb_krb5_context,
-                                 uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
+                                 uint32_t format_flags, enum drsuapi_DsNameFormat format_offered,
+                                 enum drsuapi_DsNameFormat format_desired,
                                  const char *name, struct drsuapi_DsNameInfo1 *info1)
 {
        WERROR wret;
        krb5_error_code ret;
        krb5_principal principal;
+       const krb5_data *component;
        const char *service, *dns_name;
        char *new_service;
        char *new_princ;
        enum drsuapi_DsNameStatus namestatus;
-       
+
        /* parse principal */
        ret = krb5_parse_name_flags(smb_krb5_context->krb5_context, 
                                    name, KRB5_PRINCIPAL_PARSE_NO_REALM, &principal);
        if (ret) {
-               DEBUG(2, ("Could not parse principal: %s: %s",
+               DEBUG(2, ("Could not parse principal: %s: %s\n",
                          name, smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
                                                           ret, mem_ctx)));
                return WERR_NOMEM;
        }
-       
+
        /* grab cifs/, http/ etc */
-       
+
        /* This is checked for in callers, but be safe */
-       if (principal->name.name_string.len < 2) {
+       if (krb5_princ_size(smb_krb5_context->krb5_context, principal) < 2) {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
+               krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return WERR_OK;
        }
-       service = principal->name.name_string.val[0];
-       dns_name = principal->name.name_string.val[1];
-       
+       component = krb5_princ_component(smb_krb5_context->krb5_context,
+                                        principal, 0);
+       service = (const char *)component->data;
+       component = krb5_princ_component(smb_krb5_context->krb5_context,
+                                        principal, 1);
+       dns_name = (const char *)component->data;
+
        /* MAP it */
        namestatus = LDB_lookup_spn_alias(smb_krb5_context->krb5_context, 
                                          sam_ctx, mem_ctx, 
                                          service, &new_service);
-       
+
        if (namestatus == DRSUAPI_DS_NAME_STATUS_NOT_FOUND) {
+               wret = WERR_OK;
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
                info1->dns_domain_name  = talloc_strdup(mem_ctx, dns_name);
                if (!info1->dns_domain_name) {
-                       krb5_free_principal(smb_krb5_context->krb5_context, principal);
-                       return WERR_NOMEM;
+                       wret = WERR_NOMEM;
                }
-               return WERR_OK;
+               krb5_free_principal(smb_krb5_context->krb5_context, principal);
+               return wret;
        } else if (namestatus != DRSUAPI_DS_NAME_STATUS_OK) {
                info1->status = namestatus;
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return WERR_OK;
        }
-       
-       /* ooh, very nasty playing around in the Principal... */
-       free(principal->name.name_string.val[0]);
-       principal->name.name_string.val[0] = strdup(new_service);
-       if (!principal->name.name_string.val[0]) {
-               krb5_free_principal(smb_krb5_context->krb5_context, principal);
-               return WERR_NOMEM;
-       }
-       
-       /* reform principal */
-       ret = krb5_unparse_name_flags(smb_krb5_context->krb5_context, principal, 
-                                     KRB5_PRINCIPAL_UNPARSE_NO_REALM, &new_princ);
 
-       if (ret) {
+       /* reform principal */
+       new_princ = talloc_asprintf(mem_ctx, "%s/%s", new_service, dns_name);
+       if (!new_princ) {
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return WERR_NOMEM;
        }
-       
+
        wret = DsCrackNameOneName(sam_ctx, mem_ctx, format_flags, format_offered, format_desired,
                                  new_princ, info1);
-       free(new_princ);
+       talloc_free(new_princ);
        if (W_ERROR_IS_OK(wret) && (info1->status == DRSUAPI_DS_NAME_STATUS_NOT_FOUND)) {
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
                info1->dns_domain_name  = talloc_strdup(mem_ctx, dns_name);
@@ -262,7 +261,8 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
 
 static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                             struct smb_krb5_context *smb_krb5_context,
-                            uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
+                            uint32_t format_flags, enum drsuapi_DsNameFormat format_offered,
+                            enum drsuapi_DsNameFormat format_desired,
                             const char *name, struct drsuapi_DsNameInfo1 *info1)
 {
        int ldb_ret;
@@ -271,11 +271,11 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        const char *result_filter = NULL;
        krb5_error_code ret;
        krb5_principal principal;
-       char **realm;
+       const char *realm;
        char *unparsed_name_short;
        const char *domain_attrs[] = { NULL };
        struct ldb_result *domain_res = NULL;
-       
+
        /* Prevent recursion */
        if (!name) {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -283,48 +283,54 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        }
 
        ret = krb5_parse_name_flags(smb_krb5_context->krb5_context, name, 
-                                   KRB5_PRINCIPAL_PARSE_MUST_REALM, &principal);
+                                   KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &principal);
        if (ret) {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                return WERR_OK;
        }
-       
-       realm = krb5_princ_realm(smb_krb5_context->krb5_context, principal);
 
-       ldb_ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &domain_res, 
-                                    samdb_partitions_dn(sam_ctx, mem_ctx), 
-                                    LDB_SCOPE_ONELEVEL,
-                                    domain_attrs,
-                                    "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))",
-                                    ldb_binary_encode_string(mem_ctx, *realm), 
-                                    ldb_binary_encode_string(mem_ctx, *realm));
+       realm = smb_krb5_principal_get_realm(smb_krb5_context->krb5_context,
+                                            principal);
+
+       ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
+                            samdb_partitions_dn(sam_ctx, mem_ctx),
+                            LDB_SCOPE_ONELEVEL,
+                            domain_attrs,
+                            "(&(objectClass=crossRef)(|(dnsRoot=%s)(netbiosName=%s))(systemFlags:%s:=%u))",
+                            ldb_binary_encode_string(mem_ctx, realm),
+                            ldb_binary_encode_string(mem_ctx, realm),
+                            LDB_OID_COMPARATOR_AND,
+                            SYSTEM_FLAG_CR_NTDS_DOMAIN);
 
        if (ldb_ret != LDB_SUCCESS) {
-               DEBUG(2, ("DsCrackNameUPN domain ref search failed: %s", ldb_errstring(sam_ctx)));
+               DEBUG(2, ("DsCrackNameUPN domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
+               krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return WERR_OK;
        }
-       
+
        switch (domain_res->count) {
        case 1:
                break;
        case 0:
+               krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return dns_domain_from_principal(mem_ctx, smb_krb5_context, 
                                                 name, info1);
        default:
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
+               krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return WERR_OK;
        }
-       
+
        ret = krb5_unparse_name_flags(smb_krb5_context->krb5_context, principal, 
                                      KRB5_PRINCIPAL_UNPARSE_NO_REALM, &unparsed_name_short);
        krb5_free_principal(smb_krb5_context->krb5_context, principal);
-               
+
        if (ret) {
                free(unparsed_name_short);
                return WERR_NOMEM;
        }
-       
+
        /* This may need to be extended for more userPrincipalName variations */
        result_filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(samAccountName=%s))", 
                                        ldb_binary_encode_string(mem_ctx, unparsed_name_short));
@@ -339,32 +345,115 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                      smb_krb5_context, 
                                      format_flags, format_offered, format_desired, 
                                      NULL, unparsed_name_short, domain_filter, result_filter, 
-                                     info1);
+                                     info1, LDB_SCOPE_SUBTREE, NULL);
        free(unparsed_name_short);
 
        return status;
 }
 
+/*
+ * This function will workout the filtering parameter in order to be able to do
+ * the adapted search when the incomming format is format_functional.
+ * This boils down to defining the search_dn (passed as pointer to ldb_dn *) and the
+ * ldap filter request.
+ * Main input parameters are:
+ * * name, which is the portion of the functional name after the
+ * first '/'.
+ * * domain_filter, which is a ldap search filter used to find the NC DN given the
+ * function name to crack.
+ */
+static WERROR get_format_functional_filtering_param(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
+                       char *name, struct drsuapi_DsNameInfo1 *info1,
+                       struct ldb_dn **psearch_dn, const char *domain_filter, const char **presult_filter)
+{
+       struct ldb_result *domain_res = NULL;
+       const char * const domain_attrs[] = {"ncName", NULL};
+       struct ldb_dn *partitions_basedn = samdb_partitions_dn(sam_ctx, mem_ctx);
+       int ldb_ret;
+       char *account,  *s, *result_filter = NULL;
+       struct ldb_dn *search_dn = NULL;
+
+       *psearch_dn = NULL;
+       *presult_filter = NULL;
+
+       ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
+                               partitions_basedn,
+                               LDB_SCOPE_ONELEVEL,
+                               domain_attrs,
+                               "%s", domain_filter);
+
+       if (ldb_ret != LDB_SUCCESS) {
+               DEBUG(2, ("DsCrackNameOne domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
+               info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
+               return WERR_FOOBAR;
+       }
+
+       if (domain_res->count == 1) {
+               struct ldb_dn *tmp_dn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
+               const char * const name_attrs[] = {"name", NULL};
+
+               account = name;
+               s = strchr(account, '/');
+               while(s) {
+                       s[0] = '\0';
+                       s++;
+                       talloc_free(domain_res);
+
+                       ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
+                                               tmp_dn,
+                                               LDB_SCOPE_ONELEVEL,
+                                               name_attrs,
+                                               "name=%s", account);
+
+                       if (ldb_ret != LDB_SUCCESS) {
+                               DEBUG(2, ("DsCrackNameOne domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
+                               info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
+                               return WERR_OK;
+                       }
+                       switch (domain_res->count) {
+                       case 1:
+                               break;
+                       case 0:
+                               info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
+                               return WERR_OK;
+                       default:
+                               info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
+                               return WERR_OK;
+                       }
+
+                       talloc_free(tmp_dn);
+                       tmp_dn = talloc_steal(mem_ctx, domain_res->msgs[0]->dn);
+                       talloc_free(domain_res);
+                       search_dn = tmp_dn;
+                       account = s;
+                       s = strchr(account, '/');
+               }
+               account = ldb_binary_encode_string(mem_ctx, account);
+               W_ERROR_HAVE_NO_MEMORY(account);
+               result_filter = talloc_asprintf(mem_ctx, "(name=%s)",
+                                               account);
+               W_ERROR_HAVE_NO_MEMORY(result_filter);
+       }
+       *psearch_dn = search_dn;
+       *presult_filter = result_filter;
+       return WERR_OK;
+}
+
 /* Crack a single 'name', from format_offered into format_desired, returning the result in info1 */
 
 WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
-                         uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
+                         uint32_t format_flags, enum drsuapi_DsNameFormat format_offered,
+                         enum drsuapi_DsNameFormat format_desired,
                          const char *name, struct drsuapi_DsNameInfo1 *info1)
 {
        krb5_error_code ret;
        const char *domain_filter = NULL;
        const char *result_filter = NULL;
        struct ldb_dn *name_dn = NULL;
+       struct ldb_dn *search_dn = NULL;
 
-       struct smb_krb5_context *smb_krb5_context;
-       ret = smb_krb5_init_context(mem_ctx, 
-                                   (struct event_context *)ldb_get_opaque(sam_ctx, "EventContext"), 
-                                   (struct loadparm_context *)ldb_get_opaque(sam_ctx, "loadparm"), 
-                                   &smb_krb5_context);
-                               
-       if (ret) {
-               return WERR_NOMEM;
-       }
+       struct smb_krb5_context *smb_krb5_context = NULL;
+       int scope = LDB_SCOPE_SUBTREE;
 
        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
        info1->dns_domain_name = NULL;
@@ -380,19 +469,44 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 
        /* here we need to set the domain_filter and/or the result_filter */
        switch (format_offered) {
+       case DRSUAPI_DS_NAME_FORMAT_UNKNOWN:
+       {
+               unsigned int i;
+               enum drsuapi_DsNameFormat formats[] = {
+                       DRSUAPI_DS_NAME_FORMAT_FQDN_1779, DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL,
+                       DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT, DRSUAPI_DS_NAME_FORMAT_CANONICAL,
+                       DRSUAPI_DS_NAME_FORMAT_GUID, DRSUAPI_DS_NAME_FORMAT_DISPLAY,
+                       DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL,
+                       DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
+                       DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX
+               };
+               WERROR werr;
+               for (i=0; i < ARRAY_SIZE(formats); i++) {
+                       werr = DsCrackNameOneName(sam_ctx, mem_ctx, format_flags, formats[i], format_desired, name, info1);
+                       if (!W_ERROR_IS_OK(werr)) {
+                               return werr;
+                       }
+                       if (info1->status != DRSUAPI_DS_NAME_STATUS_NOT_FOUND) {
+                               return werr;
+                       }
+               }
+               return werr;
+       }
+
        case DRSUAPI_DS_NAME_FORMAT_CANONICAL:
        case DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX:
        {
                char *str, *s, *account;
-               
+               scope = LDB_SCOPE_ONELEVEL;
+
                if (strlen(name) == 0) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                        return WERR_OK;
                }
-               
+
                str = talloc_strdup(mem_ctx, name);
                W_ERROR_HAVE_NO_MEMORY(str);
-               
+
                if (format_offered == DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX) {
                        /* Look backwards for the \n, and replace it with / */
                        s = strrchr(str, '\n');
@@ -409,28 +523,31 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                        return WERR_OK;
                }
-               
+
                s[0] = '\0';
                s++;
 
-               domain_filter = talloc_asprintf(mem_ctx, "(&(objectClass=crossRef)(ncName=%s))", 
-                                               ldb_dn_get_linearized(samdb_dns_domain_to_dn(sam_ctx, mem_ctx, str)));
+               domain_filter = talloc_asprintf(mem_ctx, "(&(objectClass=crossRef)(dnsRoot=%s)(systemFlags:%s:=%u))",
+                                               ldb_binary_encode_string(mem_ctx, str),
+                                               LDB_OID_COMPARATOR_AND,
+                                               SYSTEM_FLAG_CR_NTDS_DOMAIN);
                W_ERROR_HAVE_NO_MEMORY(domain_filter);
 
                /* There may not be anything after the domain component (search for the domain itself) */
-               if (s[0]) {
-                       
-                       account = strrchr(s, '/');
-                       if (!account) {
-                               account = s;
-                       } else {
-                               account++;
+               account = s;
+               if (account && *account) {
+                       WERROR werr = get_format_functional_filtering_param(sam_ctx,
+                                                                               mem_ctx,
+                                                                               account,
+                                                                               info1,
+                                                                               &search_dn,
+                                                                               domain_filter,
+                                                                               &result_filter);
+                       if (!W_ERROR_IS_OK(werr)) {
+                               return werr;
                        }
-                       account = ldb_binary_encode_string(mem_ctx, account);
-                       W_ERROR_HAVE_NO_MEMORY(account);
-                       result_filter = talloc_asprintf(mem_ctx, "(name=%s)",
-                                                       account);              
-                       W_ERROR_HAVE_NO_MEMORY(result_filter);
+                       if (info1->status != DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR)
+                               return WERR_OK;
                }
                break;
        }
@@ -438,10 +555,10 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                char *p;
                char *domain;
                const char *account = NULL;
-               
+
                domain = talloc_strdup(mem_ctx, name);
                W_ERROR_HAVE_NO_MEMORY(domain);
-               
+
                p = strchr(domain, '\\');
                if (!p) {
                        /* invalid input format */
@@ -449,21 +566,24 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        return WERR_OK;
                }
                p[0] = '\0';
-               
+
                if (p[1]) {
                        account = &p[1];
                }
-               
+
                domain_filter = talloc_asprintf(mem_ctx, 
-                                               "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", 
-                                               ldb_binary_encode_string(mem_ctx, domain));
+                                               "(&(objectClass=crossRef)(|(dnsRoot=%s)(netbiosName=%s))(systemFlags:%s:=%u))",
+                                               ldb_binary_encode_string(mem_ctx, domain),
+                                               ldb_binary_encode_string(mem_ctx, domain),
+                                               LDB_OID_COMPARATOR_AND,
+                                               SYSTEM_FLAG_CR_NTDS_DOMAIN);
                W_ERROR_HAVE_NO_MEMORY(domain_filter);
                if (account) {
                        result_filter = talloc_asprintf(mem_ctx, "(sAMAccountName=%s)",
                                                        ldb_binary_encode_string(mem_ctx, account));
                        W_ERROR_HAVE_NO_MEMORY(result_filter);
                }
-               
+
                talloc_free(domain);
                break;
        }
@@ -491,7 +611,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                        return WERR_OK;
                }
-                       
+
                ldap_guid = ldap_encode_ndr_GUID(mem_ctx, &guid);
                if (!ldap_guid) {
                        return WERR_NOMEM;
@@ -510,12 +630,12 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                W_ERROR_HAVE_NO_MEMORY(result_filter);
                break;
        }
-       
+
                /* A S-1234-5678 style string */
        case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY: {
                struct dom_sid *sid = dom_sid_parse_talloc(mem_ctx, name);
                char *ldap_sid;
-                                                                           
+
                domain_filter = NULL;
                if (!sid) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -534,14 +654,26 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL: {
                krb5_principal principal;
                char *unparsed_name;
+
+               ret = smb_krb5_init_context(mem_ctx, 
+                                           ldb_get_event_context(sam_ctx),
+                                           (struct loadparm_context *)ldb_get_opaque(sam_ctx, "loadparm"), 
+                                           &smb_krb5_context);
+
+               if (ret) {
+                       return WERR_NOMEM;
+               }
+
+               /* Ensure we reject compleate junk first */
                ret = krb5_parse_name(smb_krb5_context->krb5_context, name, &principal);
                if (ret) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                        return WERR_OK;
                }
-               
+
                domain_filter = NULL;
-               
+
+               /* By getting the unparsed name here, we ensure the escaping is correct (and trust the client less) */
                ret = krb5_unparse_name(smb_krb5_context->krb5_context, principal, &unparsed_name);
                if (ret) {
                        krb5_free_principal(smb_krb5_context->krb5_context, principal);
@@ -549,9 +681,11 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                }
 
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
+
+               /* The ldb_binary_encode_string() here avoid LDAP filter injection attacks */
                result_filter = talloc_asprintf(mem_ctx, "(&(objectClass=user)(userPrincipalName=%s))", 
                                                ldb_binary_encode_string(mem_ctx, unparsed_name));
-               
+
                free(unparsed_name);
                W_ERROR_HAVE_NO_MEMORY(result_filter);
                break;
@@ -559,24 +693,37 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        case DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL: {
                krb5_principal principal;
                char *unparsed_name_short;
+               const krb5_data *component;
                char *service;
+
+               ret = smb_krb5_init_context(mem_ctx, 
+                                           ldb_get_event_context(sam_ctx),
+                                           (struct loadparm_context *)ldb_get_opaque(sam_ctx, "loadparm"), 
+                                           &smb_krb5_context);
+
+               if (ret) {
+                       return WERR_NOMEM;
+               }
+
                ret = krb5_parse_name(smb_krb5_context->krb5_context, name, &principal);
-               if (ret == 0 && principal->name.name_string.len < 2) {
+               if (ret == 0 &&
+                   krb5_princ_size(smb_krb5_context->krb5_context,
+                                                       principal) < 2) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                        krb5_free_principal(smb_krb5_context->krb5_context, principal);
                        return WERR_OK;
+               } else if (ret == 0) {
+                       krb5_free_principal(smb_krb5_context->krb5_context, principal);
                }
                ret = krb5_parse_name_flags(smb_krb5_context->krb5_context, name, 
                                            KRB5_PRINCIPAL_PARSE_NO_REALM, &principal);
                if (ret) {
-                       krb5_free_principal(smb_krb5_context->krb5_context, principal);
-
                        return dns_domain_from_principal(mem_ctx, smb_krb5_context,
                                                         name, info1);
                }
 
                domain_filter = NULL;
-               
+
                ret = krb5_unparse_name_flags(smb_krb5_context->krb5_context, principal, 
                                              KRB5_PRINCIPAL_UNPARSE_NO_REALM, &unparsed_name_short);
                if (ret) {
@@ -584,13 +731,22 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        return WERR_NOMEM;
                }
 
-               service = principal->name.name_string.val[0];
-               if ((principal->name.name_string.len == 2) && (strcasecmp(service, "host") == 0)) {
+               component = krb5_princ_component(smb_krb5_context->krb5_context,
+                                                principal, 0);
+               service = (char *)component->data;
+               if ((krb5_princ_size(smb_krb5_context->krb5_context,
+                                                       principal) == 2) &&
+                       (strcasecmp(service, "host") == 0)) {
                        /* the 'cn' attribute is just the leading part of the name */
                        char *computer_name;
-                       computer_name = talloc_strndup(mem_ctx, principal->name.name_string.val[1], 
-                                                     strcspn(principal->name.name_string.val[1], "."));
+                       component = krb5_princ_component(
+                                               smb_krb5_context->krb5_context,
+                                               principal, 1);
+                       computer_name = talloc_strndup(mem_ctx, (char *)component->data,
+                                                       strcspn((char *)component->data, "."));
                        if (computer_name == NULL) {
+                               krb5_free_principal(smb_krb5_context->krb5_context, principal);
+                               free(unparsed_name_short);
                                return WERR_NOMEM;
                        }
 
@@ -604,27 +760,26 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                free(unparsed_name_short);
                W_ERROR_HAVE_NO_MEMORY(result_filter);
-               
+
                break;
        }
        default: {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                return WERR_OK;
        }
-
        }
 
        if (format_flags & DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY) {
                return DsCrackNameOneSyntactical(mem_ctx, format_offered, format_desired,
                                                 name_dn, name, info1);
        }
-       
+
        return DsCrackNameOneFilter(sam_ctx, mem_ctx, 
                                    smb_krb5_context, 
                                    format_flags, format_offered, format_desired, 
                                    name_dn, name, 
                                    domain_filter, result_filter, 
-                                   info1);
+                                   info1, scope, search_dn);
 }
 
 /* Subcase of CrackNames.  It is possible to translate a LDAP-style DN
@@ -632,7 +787,8 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
  * database */
 
 static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
-                                       uint32_t format_offered, uint32_t format_desired,
+                                       enum drsuapi_DsNameFormat format_offered,
+                                       enum drsuapi_DsNameFormat format_desired,
                                        struct ldb_dn *name_dn, const char *name, 
                                        struct drsuapi_DsNameInfo1 *info1)
 {
@@ -658,7 +814,7 @@ static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
        if (!cracked) {
                return WERR_NOMEM;
        }
-       
+
        return WERR_OK; 
 }
 
@@ -671,10 +827,12 @@ static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                   struct smb_krb5_context *smb_krb5_context,
-                                  uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
+                                  uint32_t format_flags, enum drsuapi_DsNameFormat format_offered,
+                                  enum drsuapi_DsNameFormat format_desired,
                                   struct ldb_dn *name_dn, const char *name, 
                                   const char *domain_filter, const char *result_filter, 
-                                  struct drsuapi_DsNameInfo1 *info1)
+                                  struct drsuapi_DsNameInfo1 *info1,
+                                  int scope, struct ldb_dn *search_dn)
 {
        int ldb_ret;
        struct ldb_result *domain_res = NULL;
@@ -682,7 +840,6 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
        const char * const *result_attrs;
        struct ldb_message **result_res = NULL;
        struct ldb_message *result = NULL;
-       struct ldb_dn *result_basedn = NULL;
        int i;
        char *p;
        struct ldb_dn *partitions_basedn = samdb_partitions_dn(sam_ctx, mem_ctx);
@@ -695,10 +852,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 
        const char * const _domain_attrs_nt4[] = { "ncName", "dnsRoot", "nETBIOSName", NULL};
        const char * const _result_attrs_nt4[] = { "sAMAccountName", "objectSid", "objectClass", NULL};
-               
+
        const char * const _domain_attrs_guid[] = { "ncName", "dnsRoot", NULL};
        const char * const _result_attrs_guid[] = { "objectGUID", NULL};
-               
+
        const char * const _domain_attrs_display[] = { "ncName", "dnsRoot", NULL};
        const char * const _result_attrs_display[] = { "displayName", "samAccountName", NULL};
 
@@ -736,18 +893,18 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 
        if (domain_filter) {
                /* if we have a domain_filter look it up and set the result_basedn and the dns_domain_name */
-               ldb_ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &domain_res, 
+               ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
                                             partitions_basedn,
                                             LDB_SCOPE_ONELEVEL,
                                             domain_attrs,
                                             "%s", domain_filter);
-               
+
                if (ldb_ret != LDB_SUCCESS) {
-                       DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s", ldb_errstring(sam_ctx)));
+                       DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                        return WERR_OK;
                }
-               
+
                switch (domain_res->count) {
                case 1:
                        break;
@@ -759,7 +916,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                        return WERR_OK;
                }
 
-               info1->dns_domain_name  = samdb_result_string(domain_res->msgs[0], "dnsRoot", NULL);
+               info1->dns_domain_name  = ldb_msg_find_attr_as_string(domain_res->msgs[0], "dnsRoot", NULL);
                W_ERROR_HAVE_NO_MEMORY(info1->dns_domain_name);
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
        } else {
@@ -770,67 +927,40 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
        if (result_filter) {
                int ret;
                struct ldb_result *res;
+               uint32_t dsdb_flags = 0;
+               struct ldb_dn *real_search_dn;
+
                if (domain_res) {
-                       result_basedn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
-                       
-                       ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &res, 
-                                                result_basedn, LDB_SCOPE_SUBTREE, 
-                                                result_attrs, "%s", result_filter);
-                       if (ret != LDB_SUCCESS) {
-                               talloc_free(result_res);
-                               info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
-                               return WERR_OK;
+                       if (!search_dn) {
+                               struct ldb_dn *tmp_dn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
+                               real_search_dn = tmp_dn;
+                       } else {
+                               real_search_dn = search_dn;
                        }
-                       ldb_ret = res->count;
-                       result_res = res->msgs;
                } else {
-                       /* search with the 'phantom root' flag */
-                       struct ldb_request *req;
-
-                       res = talloc_zero(mem_ctx, struct ldb_result);
-                       W_ERROR_HAVE_NO_MEMORY(res);
-                       
-                       ret = ldb_build_search_req(&req, sam_ctx, mem_ctx,
-                                                  ldb_get_root_basedn(sam_ctx),
-                                                  LDB_SCOPE_SUBTREE,
-                                                  result_filter,
-                                                  result_attrs,
-                                                  NULL,
-                                                  res,
-                                                  ldb_search_default_callback);
-                       if (ret == LDB_SUCCESS) {
-                               struct ldb_search_options_control *search_options;
-                               search_options = talloc(req, struct ldb_search_options_control);
-                               W_ERROR_HAVE_NO_MEMORY(search_options);
-                               search_options->search_options = LDB_SEARCH_OPTION_PHANTOM_ROOT;
-
-                               ret = ldb_request_add_control(req, LDB_CONTROL_SEARCH_OPTIONS_OID, false, search_options);
-                       }
-                       if (ret != LDB_SUCCESS) {
-                               talloc_free(res);
-                               info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
-                               return WERR_OK;
-                       }
-                       
-                       ldb_set_timeout(sam_ctx, req, 0); /* use default timeout */
-                       
-                       ret = ldb_request(sam_ctx, req);
-                       
-                       if (ret == LDB_SUCCESS) {
-                               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
-                       }
-                       
-                       talloc_free(req);
+                       dsdb_flags = DSDB_SEARCH_SEARCH_ALL_PARTITIONS;
+                       real_search_dn = NULL;
+               }
+               if (format_desired == DRSUAPI_DS_NAME_FORMAT_GUID){
+                        dsdb_flags = dsdb_flags| DSDB_SEARCH_SHOW_DELETED;
+               }
 
-                       if (ret != LDB_SUCCESS) {
-                               DEBUG(2, ("DsCrackNameOneFilter phantom root search failed: %s", 
-                                         ldb_errstring(sam_ctx)));
-                               info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
-                               return WERR_OK;
-                       }
-                       ldb_ret = res->count;
-                       result_res = res->msgs;
+               /* search with the 'phantom root' flag */
+               ret = dsdb_search(sam_ctx, mem_ctx, &res,
+                                 real_search_dn,
+                                 scope,
+                                 result_attrs,
+                                 dsdb_flags,
+                                 "%s", result_filter);
+               if (ret != LDB_SUCCESS) {
+                       DEBUG(2, ("DsCrackNameOneFilter phantom root search failed: %s\n",
+                                 ldb_errstring(sam_ctx)));
+                       info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
+                       return WERR_OK;
                }
+
+               ldb_ret = res->count;
+               result_res = res->msgs;
        } else if (format_offered == DRSUAPI_DS_NAME_FORMAT_FQDN_1779) {
                ldb_ret = gendb_search_dn(sam_ctx, mem_ctx, name_dn, &result_res,
                                          result_attrs);
@@ -840,7 +970,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                          result_attrs);
        } else {
                /* Can't happen */
-               DEBUG(0, ("LOGIC ERROR: DsCrackNameOneFilter domain ref search not availible: This can't happen..."));
+               DEBUG(0, ("LOGIC ERROR: DsCrackNameOneFilter domain ref search not available: This can't happen...\n"));
                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                return WERR_OK;
        }
@@ -856,16 +986,18 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                   smb_krb5_context, 
                                                   format_flags, format_offered, format_desired,
                                                   name, info1);
-                       
+
                case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL:
                        return DsCrackNameUPN(sam_ctx, mem_ctx, smb_krb5_context, 
                                              format_flags, format_offered, format_desired,
                                              name, info1);
+               default:
+                       break;
                }
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                return WERR_OK;
        case -1:
-               DEBUG(2, ("DsCrackNameOneFilter result search failed: %s", ldb_errstring(sam_ctx)));
+               DEBUG(2, ("DsCrackNameOneFilter result search failed: %s\n", ldb_errstring(sam_ctx)));
                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                return WERR_OK;
        default:
@@ -883,6 +1015,8 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                case DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX:
                                        canonical_name = ldb_dn_canonical_ex_string(mem_ctx, result_res[i]->dn);
                                        break;
+                               default:
+                                       break;
                                }
                                if (strcasecmp_m(canonical_name, name) == 0) {
                                        result = result_res[i];
@@ -906,7 +1040,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
        if (p) {
                p[0] = '\0';
        }
-       
+
        /* here we can use result and domain_res[0] */
        switch (format_desired) {
        case DRSUAPI_DS_NAME_FORMAT_FQDN_1779: {
@@ -917,7 +1051,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                return WERR_OK;
        }
        case DRSUAPI_DS_NAME_FORMAT_CANONICAL: {
-               info1->result_name      = samdb_result_string(result, "canonicalName", NULL);
+               info1->result_name      = ldb_msg_find_attr_as_string(result, "canonicalName", NULL);
                info1->status           = DRSUAPI_DS_NAME_STATUS_OK;
                return WERR_OK;
        }
@@ -932,21 +1066,21 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 
                const struct dom_sid *sid = samdb_result_dom_sid(mem_ctx, result, "objectSid");
                const char *_acc = "", *_dom = "";
-               
+
                if (samdb_find_attribute(sam_ctx, result, "objectClass", "domain")) {
 
-                       ldb_ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &domain_res, 
+                       ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
                                                     partitions_basedn,
                                                     LDB_SCOPE_ONELEVEL,
                                                     domain_attrs,
                                                     "(ncName=%s)", ldb_dn_get_linearized(result->dn));
-                       
+
                        if (ldb_ret != LDB_SUCCESS) {
-                               DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s", ldb_errstring(sam_ctx)));
+                               DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
                                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                return WERR_OK;
                        }
-                       
+
                        switch (domain_res->count) {
                        case 1:
                                break;
@@ -957,10 +1091,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
                                return WERR_OK;
                        }
-                       _dom = samdb_result_string(domain_res->msgs[0], "nETBIOSName", NULL);
+                       _dom = ldb_msg_find_attr_as_string(domain_res->msgs[0], "nETBIOSName", NULL);
                        W_ERROR_HAVE_NO_MEMORY(_dom);
                } else {
-                       _acc = samdb_result_string(result, "sAMAccountName", NULL);
+                       _acc = ldb_msg_find_attr_as_string(result, "sAMAccountName", NULL);
                        if (!_acc) {
                                info1->status = DRSUAPI_DS_NAME_STATUS_NO_MAPPING;
                                return WERR_OK;
@@ -975,19 +1109,19 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                        return WERR_OK;
                                }
                                dom_sid->num_auths--;
-                               ldb_ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &domain_res, 
+                               ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res,
                                                             NULL,
                                                             LDB_SCOPE_BASE,
                                                             attrs,
                                                             "(&(objectSid=%s)(objectClass=domain))", 
                                                             ldap_encode_ndr_dom_sid(mem_ctx, dom_sid));
-                               
+
                                if (ldb_ret != LDB_SUCCESS) {
-                                       DEBUG(2, ("DsCrackNameOneFilter domain search failed: %s", ldb_errstring(sam_ctx)));
+                                       DEBUG(2, ("DsCrackNameOneFilter domain search failed: %s\n", ldb_errstring(sam_ctx)));
                                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                        return WERR_OK;
                                }
-                               
+
                                switch (domain_res->count) {
                                case 1:
                                        break;
@@ -999,18 +1133,18 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                        return WERR_OK;
                                }
 
-                               ldb_ret = ldb_search_exp_fmt(sam_ctx, mem_ctx, &domain_res2, 
+                               ldb_ret = ldb_search(sam_ctx, mem_ctx, &domain_res2,
                                                             partitions_basedn,
                                                             LDB_SCOPE_ONELEVEL,
                                                             domain_attrs,
                                                             "(ncName=%s)", ldb_dn_get_linearized(domain_res->msgs[0]->dn));
-                               
+
                                if (ldb_ret != LDB_SUCCESS) {
-                                       DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s", ldb_errstring(sam_ctx)));
+                                       DEBUG(2, ("DsCrackNameOneFilter domain ref search failed: %s\n", ldb_errstring(sam_ctx)));
                                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                        return WERR_OK;
                                }
-                               
+
                                switch (domain_res2->count) {
                                case 1:
                                        break;
@@ -1021,32 +1155,32 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
                                        return WERR_OK;
                                }
-                               _dom = samdb_result_string(domain_res2->msgs[0], "nETBIOSName", NULL);
+                               _dom = ldb_msg_find_attr_as_string(domain_res2->msgs[0], "nETBIOSName", NULL);
                                W_ERROR_HAVE_NO_MEMORY(_dom);
                        }
                }
 
                info1->result_name      = talloc_asprintf(mem_ctx, "%s\\%s", _dom, _acc);
                W_ERROR_HAVE_NO_MEMORY(info1->result_name);
-               
+
                info1->status           = DRSUAPI_DS_NAME_STATUS_OK;
                return WERR_OK;
        }
        case DRSUAPI_DS_NAME_FORMAT_GUID: {
                struct GUID guid;
-               
+
                guid = samdb_result_guid(result, "objectGUID");
-               
+
                info1->result_name      = GUID_string2(mem_ctx, &guid);
                W_ERROR_HAVE_NO_MEMORY(info1->result_name);
-               
+
                info1->status           = DRSUAPI_DS_NAME_STATUS_OK;
                return WERR_OK;
        }
        case DRSUAPI_DS_NAME_FORMAT_DISPLAY: {
-               info1->result_name      = samdb_result_string(result, "displayName", NULL);
+               info1->result_name      = ldb_msg_find_attr_as_string(result, "displayName", NULL);
                if (!info1->result_name) {
-                       info1->result_name      = samdb_result_string(result, "sAMAccountName", NULL);
+                       info1->result_name      = ldb_msg_find_attr_as_string(result, "sAMAccountName", NULL);
                } 
                if (!info1->result_name) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -1101,9 +1235,9 @@ NTSTATUS crack_user_principal_name(struct ldb_context *sam_ctx,
        default:
                return NT_STATUS_UNSUCCESSFUL;
        }
-       
+
        *user_dn = ldb_dn_new(mem_ctx, sam_ctx, info1.result_name);
-       
+
        if (domain_dn) {
                werr = DsCrackNameOneName(sam_ctx, mem_ctx, 0,
                                          DRSUAPI_DS_NAME_FORMAT_CANONICAL,
@@ -1125,12 +1259,11 @@ NTSTATUS crack_user_principal_name(struct ldb_context *sam_ctx,
                default:
                        return NT_STATUS_UNSUCCESSFUL;
                }
-               
+
                *domain_dn = ldb_dn_new(mem_ctx, sam_ctx, info1.result_name);
        }
 
        return NT_STATUS_OK;
-       
 }
 
 /* Given a Service Principal Name (such as host/foo.bar.com@BAR.COM),
@@ -1164,9 +1297,9 @@ NTSTATUS crack_service_principal_name(struct ldb_context *sam_ctx,
        default:
                return NT_STATUS_UNSUCCESSFUL;
        }
-       
+
        *user_dn = ldb_dn_new(mem_ctx, sam_ctx, info1.result_name);
-       
+
        if (domain_dn) {
                werr = DsCrackNameOneName(sam_ctx, mem_ctx, 0,
                                          DRSUAPI_DS_NAME_FORMAT_CANONICAL,
@@ -1188,17 +1321,17 @@ NTSTATUS crack_service_principal_name(struct ldb_context *sam_ctx,
                default:
                        return NT_STATUS_UNSUCCESSFUL;
                }
-               
+
                *domain_dn = ldb_dn_new(mem_ctx, sam_ctx, info1.result_name);
        }
 
        return NT_STATUS_OK;
-       
 }
 
 NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx, 
+                               struct tevent_context *ev_ctx, 
                                struct loadparm_context *lp_ctx,
-                               uint32_t format_offered,
+                               enum drsuapi_DsNameFormat format_offered,
                                const char *name, 
                                const char **nt4_domain, const char **nt4_account)
 {
@@ -1214,7 +1347,7 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
                return NT_STATUS_OK;
        }
 
-       ldb = samdb_connect(mem_ctx, lp_ctx, system_session(mem_ctx, lp_ctx));
+       ldb = samdb_connect(mem_ctx, ev_ctx, lp_ctx, system_session(lp_ctx), 0);
        if (ldb == NULL) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
@@ -1238,20 +1371,20 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
        default:
                return NT_STATUS_UNSUCCESSFUL;
        }
-       
+
        *nt4_domain = talloc_strdup(mem_ctx, info1.result_name);
-       
+       if (*nt4_domain == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        p = strchr(*nt4_domain, '\\');
        if (!p) {
                return NT_STATUS_INVALID_PARAMETER;
        }
        p[0] = '\0';
-       
-       if (p[1]) {
-               *nt4_account = talloc_strdup(mem_ctx, &p[1]);
-       }
 
-       if (!*nt4_account || !*nt4_domain) {
+       *nt4_account = talloc_strdup(mem_ctx, &p[1]);
+       if (*nt4_account == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1259,12 +1392,13 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev_ctx, 
                                     struct loadparm_context *lp_ctx,
                                     const char *name,
                                     const char **nt4_domain,
                                     const char **nt4_account)
 {
-       uint32_t format_offered = DRSUAPI_DS_NAME_FORMAT_UKNOWN;
+       enum drsuapi_DsNameFormat format_offered = DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
 
        /* Handle anonymous bind */
        if (!name || !*name) {
@@ -1281,7 +1415,82 @@ NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
                format_offered = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
        } else if (strchr_m(name, '/')) {
                format_offered = DRSUAPI_DS_NAME_FORMAT_CANONICAL;
+       } else {
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       return crack_name_to_nt4_name(mem_ctx, ev_ctx, lp_ctx, format_offered, name, nt4_domain, nt4_account);
+}
+
+
+WERROR dcesrv_drsuapi_ListRoles(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
+                               const struct drsuapi_DsNameRequest1 *req1,
+                               struct drsuapi_DsNameCtr1 **ctr1)
+{
+       struct drsuapi_DsNameInfo1 *names;
+       uint32_t i;
+       uint32_t count = 5;/*number of fsmo role owners we are going to return*/
+
+       *ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1);
+       W_ERROR_HAVE_NO_MEMORY(*ctr1);
+       names = talloc_array(mem_ctx, struct drsuapi_DsNameInfo1, count);
+       W_ERROR_HAVE_NO_MEMORY(names);
+
+       for (i = 0; i < count; i++) {
+               WERROR werr;
+               struct ldb_dn *role_owner_dn, *fsmo_role_dn, *server_dn;
+               werr = dsdb_get_fsmo_role_info(mem_ctx, sam_ctx, i,
+                                              &fsmo_role_dn, &role_owner_dn);
+               if(!W_ERROR_IS_OK(werr)) {
+                       return werr;
+               }
+               server_dn = ldb_dn_copy(mem_ctx, role_owner_dn);
+               ldb_dn_remove_child_components(server_dn, 1);
+               names[i].status = DRSUAPI_DS_NAME_STATUS_OK;
+               names[i].dns_domain_name = samdb_dn_to_dnshostname(sam_ctx, mem_ctx,
+                                                                  server_dn);
+               if(!names[i].dns_domain_name) {
+                       DEBUG(4, ("list_roles: Failed to find dNSHostName for server %s\n",
+                                 ldb_dn_get_linearized(server_dn)));
+               }
+               names[i].result_name = talloc_strdup(mem_ctx, ldb_dn_get_linearized(role_owner_dn));
        }
 
-       return crack_name_to_nt4_name(mem_ctx, lp_ctx, format_offered, name, nt4_domain, nt4_account);
+       (*ctr1)->count = count;
+       (*ctr1)->array = names;
+
+       return WERR_OK;
+}
+
+WERROR dcesrv_drsuapi_CrackNamesByNameFormat(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
+                                            const struct drsuapi_DsNameRequest1 *req1,
+                                            struct drsuapi_DsNameCtr1 **ctr1)
+{
+       struct drsuapi_DsNameInfo1 *names;
+       uint32_t i, count;
+       WERROR status;
+
+       *ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1);
+       W_ERROR_HAVE_NO_MEMORY(*ctr1);
+
+       count = req1->count;
+       names = talloc_array(mem_ctx, struct drsuapi_DsNameInfo1, count);
+       W_ERROR_HAVE_NO_MEMORY(names);
+
+       for (i=0; i < count; i++) {
+               status = DsCrackNameOneName(sam_ctx, mem_ctx,
+                                           req1->format_flags,
+                                           req1->format_offered,
+                                           req1->format_desired,
+                                           req1->names[i].str,
+                                           &names[i]);
+               if (!W_ERROR_IS_OK(status)) {
+                       return status;
+               }
+       }
+
+       (*ctr1)->count = count;
+       (*ctr1)->array = names;
+
+       return WERR_OK;
 }