summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-25 11:40:54 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-25 12:15:05 +0200
commit4d6d783afeb64da85f89117324e43e4171df0d02 (patch)
treef5853c1799eabb60929b17bc24eb59236e139682
parentbb6761c127456d56d7d39fffe26ada2e56b0b3ed (diff)
downloadsamba-4d6d783afeb64da85f89117324e43e4171df0d02.tar.gz
samba-4d6d783afeb64da85f89117324e43e4171df0d02.tar.bz2
samba-4d6d783afeb64da85f89117324e43e4171df0d02.zip
s4:libcli/smb2: remove unused smb2_session->pid
metze
-rw-r--r--source4/libcli/smb2/request.c1
-rw-r--r--source4/libcli/smb2/session.c2
-rw-r--r--source4/libcli/smb2/smb2.h1
-rw-r--r--source4/torture/smb2/lock.c4
4 files changed, 0 insertions, 8 deletions
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 4a40d832fc..3024e01510 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -126,7 +126,6 @@ struct smb2_request *smb2_request_init_tree(struct smb2_tree *tree, uint16_t opc
body_dynamic_size);
if (req == NULL) return NULL;
- SIVAL(req->out.hdr, SMB2_HDR_PID, tree->session->pid);
req->session = tree->session;
req->tree = tree;
diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index 57033b866a..93b9896e7c 100644
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -51,8 +51,6 @@ struct smb2_session *smb2_session_init(struct smb2_transport *transport,
session->transport = talloc_reference(session, transport);
}
- session->pid = getpid();
-
session->smbXcli = smbXcli_session_create(session, transport->conn);
if (session->smbXcli == NULL) {
talloc_free(session);
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 57b6210e2a..101ef73807 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -115,7 +115,6 @@ struct smb2_tree {
struct smb2_session {
struct smb2_transport *transport;
struct gensec_security *gensec;
- uint32_t pid;
struct smbXcli_session *smbXcli;
};
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 3691830ce4..9350c136a2 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -1250,7 +1250,6 @@ static bool test_errorcode(struct torture_context *torture,
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
/* Demonstrate that the smbpid doesn't matter */
- tree->session->pid++;
lck.in.file.handle = h;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
@@ -1258,7 +1257,6 @@ static bool test_errorcode(struct torture_context *torture,
lck.in.file.handle = h2;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
- tree->session->pid--;
/* Demonstrate that a 0-byte lock inside the locked range still
* gives the same error. */
@@ -2443,12 +2441,10 @@ static bool test_context(struct torture_context *torture,
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
- tree->session->pid++;
el[0].flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_OK);
- tree->session->pid--;
el[0].flags = SMB2_LOCK_FLAG_UNLOCK;
status = smb2_lock(tree, &lck);
CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);