s4-dsdb: some more attribuutes that we should only give if asked for
[ira/wip.git] / source4 / dsdb / samdb / cracknames.c
index 7324d898a65f6c579aa4ae1044f81d69a586b789..f0bd5d23ab1ada325f2e077bef09610f68fb08c4 100644 (file)
@@ -6,34 +6,33 @@
 
    Copyright (C) Stefan Metzmacher 2004
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005
-   
+
    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/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 "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 "param/param.h"
 
@@ -55,22 +54,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 = 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;
 }              
@@ -121,7 +120,7 @@ static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, stru
                DEBUG(1, ("ldb_search: dn: %s not found", 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));
@@ -138,9 +137,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", 
@@ -187,7 +186,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
        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);
@@ -197,9 +196,9 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                                                           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) {
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -207,12 +206,12 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
        }
        service = principal->name.name_string.val[0];
        dns_name = principal->name.name_string.val[1];
-       
+
        /* 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) {
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
                info1->dns_domain_name  = talloc_strdup(mem_ctx, dns_name);
@@ -226,7 +225,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                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);
@@ -234,7 +233,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                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);
@@ -243,7 +242,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                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);
@@ -271,11 +270,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,28 +282,28 @@ 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);
+
+       realm = 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));
+                                    ldb_binary_encode_string(mem_ctx, realm), 
+                                    ldb_binary_encode_string(mem_ctx, realm));
 
        if (ldb_ret != LDB_SUCCESS) {
                DEBUG(2, ("DsCrackNameUPN domain ref search failed: %s", ldb_errstring(sam_ctx)));
                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                return WERR_OK;
        }
-       
+
        switch (domain_res->count) {
        case 1:
                break;
@@ -315,16 +314,16 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
                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));
@@ -356,15 +355,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
        const char *result_filter = NULL;
        struct ldb_dn *name_dn = NULL;
 
-       struct smb_krb5_context *smb_krb5_context;
-       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;
-       }
+       struct smb_krb5_context *smb_krb5_context = NULL;
 
        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
        info1->dns_domain_name = NULL;
@@ -380,19 +371,43 @@ 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:
+       {
+               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;
-               
+
                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,7 +424,7 @@ 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++;
 
@@ -419,7 +434,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 
                /* There may not be anything after the domain component (search for the domain itself) */
                if (s[0]) {
-                       
+
                        account = strrchr(s, '/');
                        if (!account) {
                                account = s;
@@ -438,10 +453,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,11 +464,11 @@ 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));
@@ -463,7 +478,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                                        ldb_binary_encode_string(mem_ctx, account));
                        W_ERROR_HAVE_NO_MEMORY(result_filter);
                }
-               
+
                talloc_free(domain);
                break;
        }
@@ -491,7 +506,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 +525,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 +549,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 +576,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;
@@ -560,6 +589,16 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                krb5_principal principal;
                char *unparsed_name_short;
                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) {
                        info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -576,7 +615,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                }
 
                domain_filter = NULL;
-               
+
                ret = krb5_unparse_name_flags(smb_krb5_context->krb5_context, principal, 
                                              KRB5_PRINCIPAL_UNPARSE_NO_REALM, &unparsed_name_short);
                if (ret) {
@@ -604,7 +643,7 @@ 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: {
@@ -618,7 +657,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                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, 
@@ -658,7 +697,7 @@ static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
        if (!cracked) {
                return WERR_NOMEM;
        }
-       
+
        return WERR_OK; 
 }
 
@@ -695,10 +734,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};
 
@@ -741,13 +780,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                             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)));
                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                        return WERR_OK;
                }
-               
+
                switch (domain_res->count) {
                case 1:
                        break;
@@ -772,7 +811,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                struct ldb_result *res;
                if (domain_res) {
                        result_basedn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
-                       
+
                        ret = ldb_search(sam_ctx, mem_ctx, &res,
                                                 result_basedn, LDB_SCOPE_SUBTREE, 
                                                 result_attrs, "%s", result_filter);
@@ -789,7 +828,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 
                        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,
@@ -797,7 +836,8 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                   result_attrs,
                                                   NULL,
                                                   res,
-                                                  ldb_search_default_callback);
+                                                  ldb_search_default_callback,
+                                                  NULL);
                        if (ret == LDB_SUCCESS) {
                                struct ldb_search_options_control *search_options;
                                search_options = talloc(req, struct ldb_search_options_control);
@@ -811,15 +851,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                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);
 
                        if (ret != LDB_SUCCESS) {
@@ -856,7 +894,7 @@ 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,
@@ -906,7 +944,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: {
@@ -932,7 +970,7 @@ 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(sam_ctx, mem_ctx, &domain_res,
@@ -940,13 +978,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                     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)));
                                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                return WERR_OK;
                        }
-                       
+
                        switch (domain_res->count) {
                        case 1:
                                break;
@@ -981,13 +1019,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                             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)));
                                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                        return WERR_OK;
                                }
-                               
+
                                switch (domain_res->count) {
                                case 1:
                                        break;
@@ -1004,13 +1042,13 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
                                                             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)));
                                        info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                                        return WERR_OK;
                                }
-                               
+
                                switch (domain_res2->count) {
                                case 1:
                                        break;
@@ -1028,18 +1066,18 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 
                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;
        }
@@ -1101,9 +1139,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 +1163,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 +1201,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,16 +1225,15 @@ 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 event_context *ev_ctx, 
+                               struct tevent_context *ev_ctx, 
                                struct loadparm_context *lp_ctx,
                                uint32_t format_offered,
                                const char *name, 
@@ -1215,7 +1251,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(mem_ctx, lp_ctx));
+       ldb = samdb_connect(mem_ctx, ev_ctx, lp_ctx, system_session(lp_ctx));
        if (ldb == NULL) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
@@ -1239,20 +1275,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;
        }
 
@@ -1260,13 +1296,13 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
-                                    struct event_context *ev_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;
+       uint32_t format_offered = DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
 
        /* Handle anonymous bind */
        if (!name || !*name) {
@@ -1283,6 +1319,8 @@ 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);