diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-05-01 19:29:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:26 -0500 |
| commit | 85e9412c4786ede6f94d879185d493756d37eebe (patch) | |
| tree | bb1f38e33db38af59f427228402cec1095bf4793 /source4/auth | |
| parent | 7fca1d46cea38229faf9a7092d86a452658f2ca0 (diff) | |
| download | samba-85e9412c4786ede6f94d879185d493756d37eebe.tar.gz samba-85e9412c4786ede6f94d879185d493756d37eebe.tar.bz2 samba-85e9412c4786ede6f94d879185d493756d37eebe.zip | |
r6565: Cludge, cludge, cludge...
We need to pass the 'secure channel type' to the NETLOGON layer, which
must match the account type.
(Yes, jelmer objects to this inclusion of the kitchen sink ;-)
Andrew Bartlett
(This used to be commit 8ee208a926d2b15fdc42753b1f9ee586564c6248)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth_domain.c | 2 | ||||
| -rw-r--r-- | source4/auth/auth_sam.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/source4/auth/auth_domain.c b/source4/auth/auth_domain.c index a6950445cb..4e5acf36e3 100644 --- a/source4/auth/auth_domain.c +++ b/source4/auth/auth_domain.c @@ -76,7 +76,7 @@ static NTSTATUS domain_check_password(struct auth_method_context *ctx, /* We like schannel */ b->flags &= ~DCERPC_AUTH_OPTIONS; - b->flags |= DCERPC_SCHANNEL_WORKSTATION | DCERPC_SEAL | DCERPC_SCHANNEL_128; + b->flags |= DCERPC_SCHANNEL | DCERPC_SEAL | DCERPC_SCHANNEL_128; /* Setup schannel */ status = dcerpc_pipe_connect_b(mem_ctx, &p, b, diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index b2aeff78d8..1e6c865361 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -210,12 +210,12 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, void *sam_ctx, NULL, }; - const char *domain_attrs[] = {"name", "objectSid"}; + const char *domain_attrs[] = {"flatname", "objectSid"}; if (domain_name) { /* find the domain's DN */ ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs, - "(&(|(realm=%s)(name=%s))(objectclass=domain))", + "(&(|(realm=%s)(flatname=%s))(objectclass=domain))", domain_name, domain_name); if (ret_domain == -1) { return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -410,13 +410,9 @@ static NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, void *sam_ctx, server_info->n_domain_groups = group_ret; server_info->domain_groups = groupSIDs; - str = samdb_result_string(msgs[0], "sAMAccountName", ""); - server_info->account_name = talloc_strdup(server_info, str); - NT_STATUS_HAVE_NO_MEMORY(server_info->account_name); + server_info->account_name = talloc_reference(server_info, samdb_result_string(msgs[0], "sAMAccountName", NULL)); - str = samdb_result_string(msgs_domain[0], "name", ""); - server_info->domain_name = talloc_strdup(server_info, str); - NT_STATUS_HAVE_NO_MEMORY(server_info->domain_name); + server_info->domain_name = talloc_reference(server_info, samdb_result_string(msgs_domain[0], "flatname", NULL)); str = samdb_result_string(msgs[0], "displayName", ""); server_info->full_name = talloc_strdup(server_info, str); |