From 727f3ee6acf8c7d8a4fd2c8a02eadf496e3687af Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 26 Feb 2012 17:35:28 +0100 Subject: s3:libsmb:smb2: pass previous session ID to session setup, not previous session We only need the session, and under some circumstances, it might complicate things for the caller to have to cope with the whole structure (talloc...). --- source3/torture/test_smb2.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index 5b37213f12..9334ab73bc 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -426,7 +426,8 @@ bool run_smb2_session_reconnect(int dummy) 0x0, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - cli1->smb2.session, /* in_previous_session */ + /* in_previous_session_id: */ + smb2cli_session_current_id(cli1->smb2.session), &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); @@ -460,7 +461,8 @@ bool run_smb2_session_reconnect(int dummy) 0x0, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - cli1->smb2.session, /* in_previous_session */ + /* in_previous_session_id: */ + smb2cli_session_current_id(cli1->smb2.session), &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); @@ -881,7 +883,7 @@ bool run_smb2_multi_channel(int dummy) 0x01, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - NULL, /* in_previous_session */ + 0, /* in_previous_session_id */ &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); @@ -915,7 +917,7 @@ bool run_smb2_multi_channel(int dummy) 0x01, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - NULL, /* in_previous_session */ + 0, /* in_previous_session_id */ &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); @@ -1143,7 +1145,7 @@ bool run_smb2_session_reauth(int dummy) 0x0, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - NULL, /* in_previous_session */ + 0, /* in_previous_session_id */ &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); @@ -1199,7 +1201,7 @@ bool run_smb2_session_reauth(int dummy) 0x0, /* in_flags */ SMB2_CAP_DFS, /* in_capabilities */ 0, /* in_channel */ - NULL, /* in_previous_session */ + 0, /* in_previous_session_id */ &in_blob); /* in_security_buffer */ if (subreq == NULL) { printf("smb2cli_session_setup_send() returned NULL\n"); -- cgit