diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-11-26 00:07:55 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-11-26 00:07:55 +0000 |
commit | 52c1e60e68f8e906ce7c6a82b1c32f29cd546659 (patch) | |
tree | 6947029f2acd3901377c2a525a905c845dfe02d5 /source3/rpc_client | |
parent | e88d4705c1a22636d0aa4dcf5c56e0d3f842da16 (diff) | |
download | samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.tar.gz samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.tar.bz2 samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.zip |
Merge from 3.0:
- NTLM2 fixes, don't force NTLM2
- Don't use NTLM2 for RPC, it doesn't work yet
- Add comments to winbindd_pam.c
- Merge 64 bit fixes and better debug messages in winbindd.c
Andrew Bartlett
(This used to be commit ba94e4a1ab6dc3335bbb29686ca6795d0ffad5b0)
Diffstat (limited to 'source3/rpc_client')
-rw-r--r-- | source3/rpc_client/cli_pipe.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 7517777920..49abf787ee 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -822,14 +822,6 @@ static NTSTATUS create_rpc_bind_resp(struct cli_state *cli, return NT_STATUS_NO_MEMORY; } - if (cli->pipe_auth_flags & AUTH_PIPE_SIGN) { - nt_status = ntlmssp_sign_init(cli->ntlmssp_pipe_state); - - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } - } - data_blob_free(&ntlmssp_reply); return NT_STATUS_OK; } @@ -1336,6 +1328,10 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, int pipe_idx, const char *my_na if (!NT_STATUS_IS_OK(nt_status)) return False; + /* Currently the NTLMSSP code does not implement NTLM2 correctly for signing or sealing */ + + cli->ntlmssp_pipe_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2; + nt_status = ntlmssp_set_username(cli->ntlmssp_pipe_state, cli->user_name); if (!NT_STATUS_IS_OK(nt_status)) |