diff options
| author | Jeremy Allison <jra@samba.org> | 2003-09-16 01:28:09 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-09-16 01:28:09 +0000 |
| commit | 6df89dbe1020736f25a01b1e319e849f8db89851 (patch) | |
| tree | da5806ee3539ed648aacce20c0eb40349eeac812 /source3 | |
| parent | 77adfbf4605bddeb1211586bb4ea4b1042ddbcd5 (diff) | |
| download | samba-6df89dbe1020736f25a01b1e319e849f8db89851.tar.gz samba-6df89dbe1020736f25a01b1e319e849f8db89851.tar.bz2 samba-6df89dbe1020736f25a01b1e319e849f8db89851.zip | |
Fix #442 which Alexander considered a showstopper. Allow us to join mixed
mode domains.
Jeremy.
(This used to be commit 07cfce283004d29d1f60e5d8c97e3e3d7c293805)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/ntlmssp.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 48bcb61f92..b5f7b97ae8 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -547,14 +547,6 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user, return False; } - ntlmssp_state->use_ntlmv2 = lp_client_ntlmv2_auth(); - - if (cli->sign_info.negotiated_smb_signing - || cli->sign_info.mandatory_signing) { - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; - } - do { nt_status = ntlmssp_client_update(ntlmssp_state, blob_in, &blob_out); diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 42bf18d1d2..c51b599b04 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -692,6 +692,12 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_CLIENT_STATE **ntlmssp_state) NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_NTLM2 | NTLMSSP_NEGOTIATE_KEY_EXCH | + /* + * We need to set this to allow a later SetPassword + * via the SAMR pipe to succeed. Strange.... We could + * also add NTLMSSP_NEGOTIATE_SEAL here. JRA. + * */ + NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_REQUEST_TARGET; (*ntlmssp_state)->ref_count = 1; |