s4:libcli/smb2: remove unused smb2_session->pid

metze

diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 4a40d832fce7177ef9c9b95bc18745feb38185d0..3024e01510aed924f167d64fb1f30adb1f03bd16 100644 (file)
--- 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 57033b866af57c772166916fea4bc912e8262f6f..93b9896e7cbd08a01749acb2dfb267f6f5ff3161 100644 (file)
--- 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 57b6210e2a2fc930aa09d1fb400939b9e1e99851..101ef7380760146e2662e75059bd628deac04441 100644 (file)
--- 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 3691830ce4758963a2ad0a899ee792fb1af69fc0..9350c136a2186b4e5aa82edb1cf7a23e708064bd 100644 (file)
--- 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);