summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-25 11:26:22 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-25 12:15:05 +0200
commitbb6761c127456d56d7d39fffe26ada2e56b0b3ed (patch)
treee3c0a82718aa61906de5d0bac166035f196382aa
parente20e84d5271577b5e610283d8b07b2ef6230d290 (diff)
downloadsamba-bb6761c127456d56d7d39fffe26ada2e56b0b3ed.tar.gz
samba-bb6761c127456d56d7d39fffe26ada2e56b0b3ed.tar.bz2
samba-bb6761c127456d56d7d39fffe26ada2e56b0b3ed.zip
s3:libsmb: remove unused cli_state->smb2.pid
metze
-rw-r--r--source3/include/client.h1
-rw-r--r--source3/torture/test_smb2.c9
2 files changed, 0 insertions, 10 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index 34bdda121e..748f78e0f4 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 121ab4b9d0..d46ecf065e 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