Changeset 745 for trunk/server/source4/dsdb/samdb/cracknames.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/dsdb/samdb/cracknames.c (modified) (36 diffs)

trunk/server/source4/dsdb/samdb/cracknames.c

@@ -24 +24 @@
 #include "includes.h"
 #include "librpc/gen_ndr/drsuapi.h"
+#include "lib/events/events.h"
 #include "rpc_server/common/common.h"
-#include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#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 "../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);
 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);
@@ -56 +58 @@
         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_REQUIRE_REALM, &principal);
@@ -81 +83 @@
                                                       char **alias_to)
 {
-        int i;
+        unsigned int i;
         int ret;
         struct ldb_result *res;
@@ -100 +102 @@
 
         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;
         }
@@ -178 +180 @@
 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)
 {
@@ -204 +207 @@
         if (principal->name.name_string.len < 2) {
                 info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
+                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                 return WERR_OK;
         }
@@ -215 +219 @@
 
         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;
-                }
-                return WERR_OK;
+                        wret = WERR_NOMEM;
+                }
+                krb5_free_principal(smb_krb5_context->krb5_context, principal);
+                return wret;
         } else if (namestatus != DRSUAPI_DS_NAME_STATUS_OK) {
                 info1->status = namestatus;
@@ -263 +268 @@
 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)
 {
@@ -272 +278 @@
         krb5_error_code ret;
         krb5_principal principal;
-        char *realm;
+        const char *realm;
         char *unparsed_name_short;
         const char *domain_attrs[] = { NULL };
@@ -290 +296 @@
         }
 
-        realm = krb5_principal_get_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,
@@ -303 +310 @@
                 DEBUG(2, ("DsCrackNameUPN domain ref search failed: %s", ldb_errstring(sam_ctx)));
                 info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
+                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                 return WERR_OK;
         }
@@ -310 +318 @@
                 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;
         }
@@ -349 +359 @@
 
 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)
 {
@@ -375 +386 @@
         case DRSUAPI_DS_NAME_FORMAT_UNKNOWN:
         {
-                int i;
+                unsigned int i;
                 enum drsuapi_DsNameFormat formats[] = {
                         DRSUAPI_DS_NAME_FORMAT_FQDN_1779, DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL,
@@ -454 +465 @@
                 char *p;
                 char *domain;
+                struct ldb_dn *dn_domain;
                 const char *account = NULL;
 
@@ -471 +483 @@
                 }
 
+                /* 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)(objectclass=crossRef))(ncName=*))", 
-                                                ldb_binary_encode_string(mem_ctx, domain));
+                                                "(&(&(|(nETBIOSName=%s)(nCName=%s))(objectclass=crossRef))(ncName=*))",
+                                                ldb_binary_encode_string(mem_ctx, domain),
+                                                ldb_dn_get_linearized(dn_domain));
                 W_ERROR_HAVE_NO_MEMORY(domain_filter);
                 if (account) {
@@ -606 +623 @@
                         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);
@@ -632 +649 @@
                                                       strcspn(principal->name.name_string.val[1], "."));
                         if (computer_name == NULL) {
+                                krb5_free_principal(smb_krb5_context->krb5_context, principal);
+                                free(unparsed_name_short);
                                 return WERR_NOMEM;
                         }
@@ -652 +671 @@
                 return WERR_OK;
         }
-
         }
 
@@ -673 +691 @@
 
 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)
@@ -712 +731 @@
 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, 
@@ -723 +743 @@
         struct ldb_message **result_res = NULL;
         struct ldb_message *result = NULL;
-        struct ldb_dn *result_basedn = NULL;
         int i;
         char *p;
@@ -800 +819 @@
                 }
 
-                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;
@@ -811 +830 @@
                 int ret;
                 struct ldb_result *res;
+                uint32_t dsdb_flags = 0;
+                struct ldb_dn *search_dn;
+
                 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);
-                        if (ret != LDB_SUCCESS) {
-                                talloc_free(result_res);
-                                info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
-                                return WERR_OK;
-                        }
-                        ldb_ret = res->count;
-                        result_res = res->msgs;
+                        dsdb_flags = 0;
+                        search_dn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL);
                 } 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,
-                                                   NULL);
-                        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;
-                        }
-
-                        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) {
-                                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;
-                }
+                        dsdb_flags = DSDB_SEARCH_SEARCH_ALL_PARTITIONS;
+                        search_dn = ldb_get_root_basedn(sam_ctx);
+                }
+
+                /* search with the 'phantom root' flag */
+                ret = dsdb_search(sam_ctx, mem_ctx, &res,
+                                  search_dn,
+                                  LDB_SCOPE_SUBTREE,
+                                  result_attrs,
+                                  DSDB_SEARCH_SEARCH_ALL_PARTITIONS,
+                                  "%s", result_filter);
+                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;
         } else if (format_offered == DRSUAPI_DS_NAME_FORMAT_FQDN_1779) {
                 ldb_ret = gendb_search_dn(sam_ctx, mem_ctx, name_dn, &result_res,
@@ -880 +866 @@
         } 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..."));
                 info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
                 return WERR_OK;
@@ -901 +887 @@
                                               format_flags, format_offered, format_desired,
                                               name, info1);
+                default:
+                        break;
                 }
                 info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
@@ -923 +911 @@
                                         canonical_name = ldb_dn_canonical_ex_string(mem_ctx, result_res[i]->dn);
                                         break;
+                                default:
+                                        break;
                                 }
                                 if (strcasecmp_m(canonical_name, name) == 0) {
@@ -957 +947 @@
         }
         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;
@@ -997 +987 @@
                                 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;
@@ -1061 +1051 @@
                                         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);
                         }
@@ -1084 +1074 @@
         }
         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) {
@@ -1237 +1227 @@
                                 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)
@@ -1253 +1243 @@
         }
 
-        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), 0);
         if (ldb == NULL) {
                 return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -1289 +1279 @@
         p[0] = '\0';
 
-        if (p[1]) {
-                *nt4_account = talloc_strdup(mem_ctx, &p[1]);
-                if (*nt4_account == NULL) {
-                        return NT_STATUS_NO_MEMORY;
-                }
+        *nt4_account = talloc_strdup(mem_ctx, &p[1]);
+        if (*nt4_account == NULL) {
+                return NT_STATUS_NO_MEMORY;
         }
 
@@ -1306 +1294 @@
                                      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 */
@@ -1329 +1317 @@
         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",
+                                  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;
+}