diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-01-10 10:48:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:37 -0500 |
| commit | 7db9de3ea9d0b3693aea08b3050f378a4ca9cf0b (patch) | |
| tree | 380cf934d5d65d5ef2af720d381252efc6056c26 /source4/librpc/rpc/dcerpc_util.c | |
| parent | 047d41cc490c05dd07eeab29913b3f2882887678 (diff) | |
| download | samba-7db9de3ea9d0b3693aea08b3050f378a4ca9cf0b.tar.gz samba-7db9de3ea9d0b3693aea08b3050f378a4ca9cf0b.tar.bz2 samba-7db9de3ea9d0b3693aea08b3050f378a4ca9cf0b.zip | |
r4635: Fix NTLMSSP to return NT_STATUS_OK when it has constructed the auth
token in the client (the final token in the negotiation).
Consequential fixes in the SPNEGO code, which now uses the out.length
as the indicator of 'I need to send something to the other side'.
Merge the NTLM and SPNEGO DCE-RPC authentication routines in the client.
Fix the RPC-MULTIBIND test consequent to this merge.
Andrew Bartlett
(This used to be commit 43e3516fc03008e97ebb4ad1a0cde464303f43c6)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_util.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 992368777c..b815f5317d 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -785,7 +785,6 @@ static NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p, const char *password) { NTSTATUS status; - p->conn->flags = binding->flags; /* remember the binding string for possible secondary connections */ @@ -794,10 +793,17 @@ static NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p, if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) { status = dcerpc_bind_auth_schannel(p, pipe_uuid, pipe_version, domain, username, password); - } else if (username && username[0] && (binding->flags & DCERPC_AUTH_SPNEGO)) { - status = dcerpc_bind_auth_spnego(p, pipe_uuid, pipe_version, domain, username, password); } else if (username && username[0]) { - status = dcerpc_bind_auth_ntlm(p, pipe_uuid, pipe_version, domain, username, password); + uint8_t auth_type; + if (binding->flags & DCERPC_AUTH_SPNEGO) { + auth_type = DCERPC_AUTH_TYPE_SPNEGO; + } else { + auth_type = DCERPC_AUTH_TYPE_NTLMSSP; + } + + status = dcerpc_bind_auth_password(p, pipe_uuid, pipe_version, + domain, username, password, + auth_type); } else { status = dcerpc_bind_auth_none(p, pipe_uuid, pipe_version); } |