s4:rpc_server/common: make use dcesrv_call_session_info()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=7113
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11892

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/rpc_server/common/forward.c b/source4/rpc_server/common/forward.c
index 45ce6dcac93b4fd46a919f83412aba04581f10b0..7d60bd7614213e502d318b67a66e94ff5e492cc2 100644 (file)
--- a/source4/rpc_server/common/forward.c
+++ b/source4/rpc_server/common/forward.c
@@ -72,7 +72,8 @@ void dcesrv_irpc_forward_rpc_call(struct dcesrv_call_state *dce_call, TALLOC_CTX
        struct dcesrv_forward_state *st;
        struct dcerpc_binding_handle *binding_handle;
        struct tevent_req *subreq;
-       struct security_token *token;
+       struct auth_session_info *session_info =
+               dcesrv_call_session_info(dce_call);
 
        st = talloc(mem_ctx, struct dcesrv_forward_state);
        if (st == NULL) {
@@ -105,8 +106,8 @@ void dcesrv_irpc_forward_rpc_call(struct dcesrv_call_state *dce_call, TALLOC_CTX
        dcerpc_binding_handle_set_timeout(binding_handle, timeout);
 
        /* add security token to the handle*/
-       token = dce_call->conn->auth_state.session_info->security_token;
-       irpc_binding_handle_add_security_token(binding_handle, token);
+       irpc_binding_handle_add_security_token(binding_handle,
+                                              session_info->security_token);
 
        /* forward the call */
        subreq = dcerpc_binding_handle_call_send(st, dce_call->event_ctx,

diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 836e6d10f84bbfa519d915b1287b47e9faeecbd0..6e475bcc796441c3078cc96a6a207928a5aa4d0f 100644 (file)
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -206,10 +206,12 @@ struct ldb_context *dcesrv_samdb_connect_as_system(
                dce_call->conn->remote_address,
                0);
        if (samdb) {
+               struct auth_session_info *session_info =
+                       dcesrv_call_session_info(dce_call);
                ldb_set_opaque(
                        samdb,
                        DSDB_NETWORK_SESSION_INFO,
-                       dce_call->conn->auth_state.session_info);
+                       session_info);
        }
        return samdb;
 }