diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-22 21:09:00 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-24 19:02:31 +0100 |
| commit | 9ebdee281712dd6c89e406aa0e374e12c4dd8eb4 (patch) | |
| tree | 244935ca18588a3464f0302c8bd315c4f4e906d1 /source3/libsmb/clifsinfo.c | |
| parent | bda3d491b416f780f63841e9f3a92b9a94c2aadc (diff) | |
| download | samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.tar.gz samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.tar.bz2 samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.zip | |
s3:libsmb: implement cli_state based functions on top of smbXcli_conn/smbXcli_req
metze
Diffstat (limited to 'source3/libsmb/clifsinfo.c')
| -rw-r--r-- | source3/libsmb/clifsinfo.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index a5b7838b2a..e0e42bded7 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -28,6 +28,7 @@ #include "trans2.h" #include "ntlmssp_wrap.h" #include "auth/gensec/gensec.h" +#include "../libcli/smb/smbXcli_base.h" /**************************************************************************** Get UNIX extensions version info. @@ -664,17 +665,14 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli, data_blob_free(&blob_in); if (NT_STATUS_IS_OK(status)) { + es->enc_on = true; /* Replace the old state, if any. */ - if (cli->trans_enc_state) { - common_free_encryption_state(&cli->trans_enc_state); - } /* We only need the gensec_security part from here. * es is a malloc()ed pointer, so we cannot make * gensec_security a talloc child */ es->s.gensec_security = talloc_move(NULL, &auth_ntlmssp_state->gensec_security); - cli->trans_enc_state = es; - cli->trans_enc_state->enc_on = True; + smb1cli_conn_set_encryption(cli->conn, es); es = NULL; } @@ -837,12 +835,9 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli) data_blob_free(&blob_recv); if (NT_STATUS_IS_OK(status)) { + es->enc_on = true; /* Replace the old state, if any. */ - if (cli->trans_enc_state) { - common_free_encryption_state(&cli->trans_enc_state); - } - cli->trans_enc_state = es; - cli->trans_enc_state->enc_on = True; + smb1cli_conn_set_encryption(cli->conn, es); es = NULL; } |