s4:libcli/smb2: remove unused 'primary' argument of smb2_session_init()

This also gets rid of a talloc_reference() usage.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 18977d8523e5d46990b20219c8ea7bd163d4f8ed..7a69b3e7d35d2866c13db2d4786f7967e234ce18 100644 (file)
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -172,7 +172,7 @@ static void smb2_connect_negprot_done(struct tevent_req *subreq)
        /* This is a hack... */
        smb2cli_conn_set_max_credits(transport->conn, 30);
 
-       state->session = smb2_session_init(transport, state->gensec_settings, state, true);
+       state->session = smb2_session_init(transport, state->gensec_settings, state);
        if (tevent_req_nomem(state->session, req)) {
                return;
        }

diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index dfc607e0e83e993d4d65d1f34148996231da13c5..4d1402a09b34439c3fe52abd14a676095b033169 100644 (file)
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -36,7 +36,7 @@
  */
 struct smb2_session *smb2_session_init(struct smb2_transport *transport,
                                       struct gensec_settings *settings,
-                                      TALLOC_CTX *parent_ctx, bool primary)
+                                      TALLOC_CTX *parent_ctx)
 {
        struct smb2_session *session;
        NTSTATUS status;
@@ -45,11 +45,7 @@ struct smb2_session *smb2_session_init(struct smb2_transport *transport,
        if (!session) {
                return NULL;
        }
-       if (primary) {
-               session->transport = talloc_steal(session, transport);
-       } else {
-               session->transport = talloc_reference(session, transport);
-       }
+       session->transport = talloc_steal(session, transport);
 
        session->smbXcli = smbXcli_session_create(session, transport->conn);
        if (session->smbXcli == NULL) {

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 97761d71a78c342da56dff59bc898150a3829afe..4297cee60a193767fd829732a9fcc973371b6176 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -323,7 +323,7 @@ bool torture_smb2_session_setup(struct torture_context *tctx,
 
        session = smb2_session_init(transport,
                                    lpcfg_gensec_settings(tctx, tctx->lp_ctx),
-                                   mem_ctx, true);
+                                   mem_ctx);
 
        if (session == NULL) {
                return false;