]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
rpc_server3: Remove dcerpc_ncacn_conn->session_info
authorVolker Lendecke <vl@samba.org>
Wed, 6 Oct 2021 09:16:21 +0000 (11:16 +0200)
committerJeremy Allison <jra@samba.org>
Wed, 5 Jan 2022 00:11:38 +0000 (00:11 +0000)
This was only used inside rpc_worker_new_client(), a leftover from
times where accepting a client was an async process waiting for the
struct named_pipe_auth_req_info4.

The talloc hierarchy is correctly maintained, dcesrv_endpoint_connect() takes a
talloc_reference() of session_info.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/rpc_server/rpc_server.h
source3/rpc_server/rpc_worker.c

index 4aafd141147a9b0e7b57a303aa3a6fff947b2402..4e0eda73d006e3b78d086a0f5186c3437b687852 100644 (file)
@@ -43,7 +43,6 @@ struct dcerpc_ncacn_conn {
 
        char *remote_client_name;
        char *local_server_name;
-       struct auth_session_info *session_info;
 };
 
 void set_incoming_fault(struct pipes_struct *p);
index 165dd64f926a9f7a4afde1a6912fd9534b615efa..b3720e8f1f042e5d3bc1ac7ff091679021c548c6 100644 (file)
@@ -376,11 +376,8 @@ static void rpc_worker_new_client(
        }
        sock = -1;
 
-       ncacn_conn->session_info = talloc_move(
-               ncacn_conn, &info5->session_info->session_info);
-
        if (security_token_is_system(
-                   ncacn_conn->session_info->security_token) &&
+                   info5->session_info->session_info->security_token) &&
            (transport != NCALRPC)) {
                DBG_DEBUG("System token only allowed on NCALRPC\n");
                goto fail;
@@ -398,7 +395,7 @@ static void rpc_worker_new_client(
                dce_ctx,
                ncacn_conn,
                ep,
-               ncacn_conn->session_info,
+               info5->session_info->session_info,
                global_event_context(),
                DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
                &dcesrv_conn);