diff options
author | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 08:12:35 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 08:12:35 +0000 |
commit | 7f87b207a72811b0d00945fadafc51559e561828 (patch) | |
tree | ad7bea94e1c02519e2f7a1755a5b5823de849012 /source3/rpc_client | |
parent | 3c900cf40b3389d59f0715385e49f490081f86ea (diff) | |
download | samba-7f87b207a72811b0d00945fadafc51559e561828.tar.gz samba-7f87b207a72811b0d00945fadafc51559e561828.tar.bz2 samba-7f87b207a72811b0d00945fadafc51559e561828.zip |
Merge NTLMSSP fixes from 3.0 to HEAD.
Andrew Bartlett
(This used to be commit f7d39c787771616ddb015bd77e3e6cd33f0c7a15)
Diffstat (limited to 'source3/rpc_client')
-rw-r--r-- | source3/rpc_client/cli_pipe.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 49abf787ee..3213e955b6 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -1342,11 +1342,18 @@ 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; - pwd_get_cleartext(&cli->pwd, password); - nt_status = ntlmssp_set_password(cli->ntlmssp_pipe_state, - password); - if (!NT_STATUS_IS_OK(nt_status)) - return False; + if (cli->pwd.null_pwd) { + nt_status = ntlmssp_set_password(cli->ntlmssp_pipe_state, + NULL); + if (!NT_STATUS_IS_OK(nt_status)) + return False; + } else { + pwd_get_cleartext(&cli->pwd, password); + nt_status = ntlmssp_set_password(cli->ntlmssp_pipe_state, + password); + if (!NT_STATUS_IS_OK(nt_status)) + return False; + } if (cli->pipe_auth_flags & AUTH_PIPE_SIGN) { cli->ntlmssp_pipe_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; |