diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:36:00 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:36:00 +0200 |
| commit | 17695ffca57c93b828719310c26b0a41b609b101 (patch) | |
| tree | 80226efc681b8e1be82c146e0d95f04c36a52804 /source | |
| parent | 52428c8ba8f4f73e648696cae3136884e94575d7 (diff) | |
| download | samba-17695ffca57c93b828719310c26b0a41b609b101.tar.gz | |
Revert "winbindd: Fix crash in cm_connect_sam()"
This reverts commit 9bbd6ee5db03747499bd263bb1365c8cd352076d.
Diffstat (limited to 'source')
| -rw-r--r-- | source/winbindd/winbindd_cm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index ab8287a01a1..c9769bfdca8 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/winbindd/winbindd_cm.c @@ -846,7 +846,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, result = ads_ntstatus(ads_status); if (NT_STATUS_IS_OK(result)) { /* Ensure creds are stored for NTLMSSP authenticated pipe access. */ - cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password); + cli_init_creds(*cli, machine_account, domain->name, machine_password); goto session_setup_done; } } @@ -871,7 +871,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, result = ads_ntstatus(ads_status); if (NT_STATUS_IS_OK(result)) { /* Ensure creds are stored for NTLMSSP authenticated pipe access. */ - cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password); + cli_init_creds(*cli, machine_account, domain->name, machine_password); goto session_setup_done; } } @@ -1900,10 +1900,6 @@ static bool cm_get_schannel_dcinfo(struct winbindd_domain *domain, /* Return a pointer to the struct dcinfo from the netlogon pipe. */ - if (!domain->conn.netlogon_pipe->dc) { - return false; - } - *ppdc = domain->conn.netlogon_pipe->dc; return True; } @@ -1930,7 +1926,6 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, goto done; } - /* * No SAMR pipe yet. Attempt to get an NTLMSSP SPNEGO authenticated * sign and sealed pipe using the machine account password by |