From bb6761c127456d56d7d39fffe26ada2e56b0b3ed Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 25 Jul 2012 11:26:22 +0200 Subject: [PATCH] s3:libsmb: remove unused cli_state->smb2.pid metze --- source3/include/client.h | 1 - source3/torture/test_smb2.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/source3/include/client.h b/source3/include/client.h index 34bdda121e2..748f78e0f4d 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -108,7 +108,6 @@ struct cli_state { } smb1; struct { - uint32_t pid; struct smbXcli_session *session; struct smbXcli_tcon *tcon; } smb2; diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index 121ab4b9d04..d46ecf065e2 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -49,7 +49,6 @@ bool run_smb2_basic(int dummy) if (!torture_init_connection(&cli)) { return false; } - cli->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_SMB2_02, PROTOCOL_SMB2_02); @@ -228,7 +227,6 @@ bool run_smb2_negprot(int dummy) if (!torture_init_connection(&cli)) { return false; } - cli->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE, PROTOCOL_LATEST); @@ -308,7 +306,6 @@ bool run_smb2_session_reconnect(int dummy) if (!torture_init_connection(&cli1)) { return false; } - cli1->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli1->conn, cli1->timeout, PROTOCOL_SMB2_02, PROTOCOL_LATEST); @@ -390,7 +387,6 @@ bool run_smb2_session_reconnect(int dummy) if (!torture_init_connection(&cli2)) { return false; } - cli2->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli2->conn, cli2->timeout, PROTOCOL_SMB2_02, PROTOCOL_LATEST); @@ -726,7 +722,6 @@ bool run_smb2_tcon_dependence(int dummy) if (!torture_init_connection(&cli)) { return false; } - cli->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_SMB2_02, PROTOCOL_LATEST); @@ -853,17 +848,14 @@ bool run_smb2_multi_channel(int dummy) if (!torture_init_connection(&cli1)) { return false; } - cli1->smb2.pid = 0xFEFF; if (!torture_init_connection(&cli2)) { return false; } - cli2->smb2.pid = 0xFEFF; if (!torture_init_connection(&cli3)) { return false; } - cli3->smb2.pid = 0xFEFF; status = smbXcli_negprot(cli1->conn, cli1->timeout, PROTOCOL_SMB2_22, PROTOCOL_LATEST); @@ -1455,7 +1447,6 @@ bool run_smb2_session_reauth(int dummy) if (!torture_init_connection(&cli)) { return false; } - cli->smb2.pid = 0xFEFF; /* * PROTOCOL_SMB2_22 has a bug in win8pre0 -- 2.11.4.GIT