diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-09-22 01:50:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:39 -0500 |
| commit | 51cbc188df03f9ee38599fe5a87ec2608117a845 (patch) | |
| tree | e446c68879a08f5c30de72d6029f6d7e2a32880b /source4/libcli/composite | |
| parent | 3b7f8ddd9a7c0d372a0585790913ac95c9eb3324 (diff) | |
| download | samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.gz samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.bz2 samba-51cbc188df03f9ee38599fe5a87ec2608117a845.zip | |
r10402: Make the RPC-SAMLOGON test pass against Win2k3 SP0 again.
I still have issues with Win2k3 SP1, and Samba4 doesn't pass it's own
test for the moment, but I'm working on these issues :-)
This required a change to the credentials API, so that the special
case for NTLM logins using a principal was indeed handled as a
special, not general case.
Also don't set the realm from a ccache, as then it overrides --option=realm=.
Andrew Bartlett
(This used to be commit 194e8f07c0cb4685797c5a7a074577c62dfdebe3)
Diffstat (limited to 'source4/libcli/composite')
| -rw-r--r-- | source4/libcli/composite/sesssetup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c index b925f99bed..3bd9ed285d 100644 --- a/source4/libcli/composite/sesssetup.c +++ b/source4/libcli/composite/sesssetup.c @@ -174,8 +174,9 @@ static NTSTATUS session_setup_nt1(struct composite_context *c, state->setup.nt1.in.capabilities = io->in.capabilities; state->setup.nt1.in.os = "Unix"; state->setup.nt1.in.lanman = talloc_asprintf(state, "Samba %s", SAMBA_VERSION_STRING); - state->setup.nt1.in.user = cli_credentials_get_username(io->in.credentials, state); - state->setup.nt1.in.domain = cli_credentials_get_domain(io->in.credentials); + cli_credentials_get_ntlm_username_domain(io->in.credentials, state, + &state->setup.nt1.in.user, + &state->setup.nt1.in.domain); if (!password) { state->setup.nt1.in.password1 = data_blob(NULL, 0); @@ -259,10 +260,11 @@ static NTSTATUS session_setup_old(struct composite_context *c, state->setup.old.in.mpx_max = session->transport->options.max_mux; state->setup.old.in.vc_num = 1; state->setup.old.in.sesskey = io->in.sesskey; - state->setup.old.in.domain = cli_credentials_get_domain(io->in.credentials); - state->setup.old.in.user = cli_credentials_get_username(io->in.credentials, state); state->setup.old.in.os = "Unix"; state->setup.old.in.lanman = talloc_asprintf(state, "Samba %s", SAMBA_VERSION_STRING); + cli_credentials_get_ntlm_username_domain(io->in.credentials, state, + &state->setup.old.in.user, + &state->setup.old.in.domain); if (!password) { state->setup.old.in.password = data_blob(NULL, 0); |