Fix #442 which Alexander considered a showstopper. Allow us to join mixed

mode domains.
Jeremy.

diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 48bcb61f9266111daa5a1ab310d1e63fa781d4a8..b5f7b97ae83f9bca6553403d2c8c34c70b0508cc 100644 (file)
--- a/source/libsmb/cliconnect.c
+++ b/source/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/source/libsmb/ntlmssp.c b/source/libsmb/ntlmssp.c
index 42bf18d1d26516f85d9eba897ecded27b1224a7a..c51b599b0411c40c1abc43665bf064d66d919fa6 100644 (file)
--- a/source/libsmb/ntlmssp.c
+++ b/source/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;