Cracknames: use krb wrapper functions so it works with MIT
[idra/samba.git] / source4 / dsdb / samdb / cracknames.c
index 63fe34552da2b325013037593e28e5021a77f60c..0c0fb82de15b44976bbf22a0cc0635f09e7963c1 100644 (file)
@@ -25,9 +25,8 @@
 #include "librpc/gen_ndr/drsuapi.h"
 #include "lib/events/events.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 <ldb.h>
+#include <ldb_errors.h>
 #include "auth/kerberos/kerberos.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.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);
 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);
 
@@ -64,7 +65,7 @@ static WERROR dns_domain_from_principal(TALLOC_CTX *mem_ctx, struct smb_krb5_con
        }
 
        /* This isn't an allocation assignemnt, so it is free'ed with the krb5_free_principal */
-       realm = krb5_principal_get_realm(smb_krb5_context->krb5_context, principal);
+       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);
@@ -111,20 +112,20 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
                         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;
        }
 
        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;
        }
@@ -177,12 +178,14 @@ 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;
+       krb5_data *component;
        const char *service, *dns_name;
        char *new_service;
        char *new_princ;
@@ -192,7 +195,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
        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;
@@ -201,12 +204,17 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
        /* 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, 
@@ -214,39 +222,30 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                                          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) {
+       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;
@@ -289,19 +289,23 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                return WERR_OK;
        }
 
-       realm = krb5_principal_get_realm(smb_krb5_context->krb5_context, principal);
+       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,
-                                    "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))",
-                                    ldb_binary_encode_string(mem_ctx, realm), 
-                                    ldb_binary_encode_string(mem_ctx, realm));
+                            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;
        }
 
@@ -309,10 +313,12 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        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;
        }
 
@@ -348,7 +354,8 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 /* 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;
@@ -429,8 +436,10 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                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) */
@@ -453,7 +462,6 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        case DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT: {
                char *p;
                char *domain;
-               struct ldb_dn *dn_domain;
                const char *account = NULL;
 
                domain = talloc_strdup(mem_ctx, name);
@@ -471,14 +479,12 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        account = &p[1];
                }
 
-               /* it could be in DNS domain form */
-               dn_domain = samdb_dns_domain_to_dn(sam_ctx, mem_ctx, domain);
-               W_ERROR_HAVE_NO_MEMORY(dn_domain);
-
                domain_filter = talloc_asprintf(mem_ctx, 
-                                               "(&(&(|(nETBIOSName=%s)(nCName=%s))(objectclass=crossRef))(ncName=*))",
+                                               "(&(objectClass=crossRef)(|(dnsRoot=%s)(netbiosName=%s))(systemFlags:%s:=%u))",
+                                               ldb_binary_encode_string(mem_ctx, domain),
                                                ldb_binary_encode_string(mem_ctx, domain),
-                                               ldb_dn_get_linearized(dn_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)",
@@ -595,6 +601,7 @@ 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;
+               krb5_data *component;
                char *service;
 
                ret = smb_krb5_init_context(mem_ctx, 
@@ -607,16 +614,18 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                }
 
                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);
                }
@@ -630,13 +639,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;
                        }
 
@@ -657,7 +675,6 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
                return WERR_OK;
        }
-
        }
 
        if (format_flags & DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY) {
@@ -678,7 +695,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)
 {
@@ -717,7 +735,8 @@ 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)
@@ -788,7 +807,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                             "%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;
                }
@@ -804,7 +823,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 {
@@ -823,7 +842,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                        search_dn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
                } else {
                        dsdb_flags = DSDB_SEARCH_SEARCH_ALL_PARTITIONS;
-                       search_dn = ldb_get_root_basedn(sam_ctx);
+                       search_dn = NULL;
+               }
+               if (format_desired == DRSUAPI_DS_NAME_FORMAT_GUID){
+                        dsdb_flags = dsdb_flags| DSDB_SEARCH_SHOW_DELETED;
                }
 
                /* search with the 'phantom root' flag */
@@ -831,10 +853,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                  search_dn,
                                  LDB_SCOPE_SUBTREE,
                                  result_attrs,
-                                 DSDB_SEARCH_SEARCH_ALL_PARTITIONS,
+                                 dsdb_flags,
                                  "%s", result_filter);
                if (ret != LDB_SUCCESS) {
-                       DEBUG(2, ("DsCrackNameOneFilter phantom root search failed: %s",
+                       DEBUG(2, ("DsCrackNameOneFilter phantom root search failed: %s\n",
                                  ldb_errstring(sam_ctx)));
                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                        return WERR_OK;
@@ -851,7 +873,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 available: 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;
        }
@@ -872,11 +894,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                        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:
@@ -894,6 +918,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];
@@ -928,7 +954,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;
        }
@@ -953,7 +979,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                     "(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;
                        }
@@ -968,10 +994,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;
@@ -994,7 +1020,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                             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;
                                }
@@ -1017,7 +1043,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                             "(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;
                                }
@@ -1032,7 +1058,7 @@ 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);
                        }
                }
@@ -1055,9 +1081,9 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                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;
@@ -1208,7 +1234,7 @@ NTSTATUS crack_service_principal_name(struct ldb_context *sam_ctx,
 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)
 {
@@ -1224,7 +1250,7 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
                return NT_STATUS_OK;
        }
 
-       ldb = samdb_connect(mem_ctx, ev_ctx, lp_ctx, system_session(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;
        }
@@ -1275,7 +1301,7 @@ NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
                                     const char **nt4_domain,
                                     const char **nt4_account)
 {
-       uint32_t format_offered = DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
+       enum drsuapi_DsNameFormat format_offered = DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
 
        /* Handle anonymous bind */
        if (!name || !*name) {
@@ -1298,3 +1324,76 @@ NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
 
        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));
+       }
+
+       (*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;
+}