s4:rpc_server: only pass dcesrv_auth to auth_state.session_key_fn()

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/reply.c b/source4/rpc_server/common/reply.c
index ef2906e07242ad8f2b2bddb8577206adc91bb468..d0d81fe10279a44fa98cd8c7c324ee1dd3426b10 100644 (file)
--- a/source4/rpc_server/common/reply.c
+++ b/source4/rpc_server/common/reply.c
@@ -272,16 +272,3 @@ _PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
 
        return NT_STATUS_OK;
 }
-
-NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *c,
-                                   DATA_BLOB *session_key)
-{
-       enum dcerpc_transport_t transport =
-               dcerpc_binding_get_transport(c->endpoint->ep_description);
-
-       if (transport != NCALRPC && transport != NCACN_UNIX_STREAM) {
-               return NT_STATUS_NO_USER_SESSION_KEY;
-       }
-
-       return dcerpc_generic_session_key(NULL, session_key);
-}

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 5d7dfaf965ed5f5eef5ef1b4e1928d597e7fffeb..7ceaf03c673eaa3ad1e3c14e9eba1f771afa4f20 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -474,11 +474,9 @@ static NTSTATUS dcesrv_session_info_session_key(struct dcesrv_auth *auth,
        return NT_STATUS_OK;
 }
 
-NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
-                                     DATA_BLOB *session_key)
+static NTSTATUS dcesrv_remote_session_key(struct dcesrv_auth *auth,
+                                         DATA_BLOB *session_key)
 {
-       struct dcesrv_auth *auth = &p->auth_state;
-
        if (auth->auth_type != DCERPC_AUTH_TYPE_NONE) {
                return NT_STATUS_NO_USER_SESSION_KEY;
        }
@@ -486,6 +484,20 @@ NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
        return dcesrv_session_info_session_key(auth, session_key);
 }
 
+static NTSTATUS dcesrv_local_fixed_session_key(struct dcesrv_auth *auth,
+                                              DATA_BLOB *session_key)
+{
+       return dcerpc_generic_session_key(NULL, session_key);
+}
+
+NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
+                                     DATA_BLOB *session_key)
+{
+       struct dcesrv_auth *auth = &p->auth_state;
+
+       return dcesrv_remote_session_key(auth, session_key);
+}
+
 /*
  * Fetch the authentication session key if available.
  *
@@ -511,11 +523,11 @@ _PUBLIC_ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
        struct dcesrv_auth *auth = &p->auth_state;
        NTSTATUS status;
 
-       if (auth->session_key == NULL) {
+       if (auth->session_key_fn == NULL) {
                return NT_STATUS_NO_USER_SESSION_KEY;
        }
 
-       status = auth->session_key(p, session_key);
+       status = auth->session_key_fn(auth, session_key);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -582,11 +594,11 @@ static NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
        p->auth_state.session_info = session_info;
        switch (transport) {
        case NCACN_NP:
-               p->auth_state.session_key = dcesrv_inherited_session_key;
+               p->auth_state.session_key_fn = dcesrv_remote_session_key;
                break;
        case NCALRPC:
        case NCACN_UNIX_STREAM:
-               p->auth_state.session_key = dcesrv_generic_session_key;
+               p->auth_state.session_key_fn = dcesrv_local_fixed_session_key;
                break;
        default:
                /*

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index f6f4954a8043fe65ca7429ecfaf974d263078dd8..1d80a2fa26f7e72c1dbb168252c34c558c4329a3 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -199,7 +199,7 @@ struct dcesrv_auth {
        uint32_t auth_context_id;
        struct gensec_security *gensec_security;
        struct auth_session_info *session_info;
-       NTSTATUS (*session_key)(struct dcesrv_connection *, DATA_BLOB *session_key);
+       NTSTATUS (*session_key_fn)(struct dcesrv_auth *, DATA_BLOB *session_key);
        bool client_hdr_signing;
        bool hdr_signing;
        bool auth_finished;