From 38e0c06abc71620af7c8cfc44af326d10ff9ff14 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 Nov 2018 23:39:11 +0100 Subject: [PATCH] s4:rpc_server: move bind_time_features to dcesrv_assoc_group 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 Reviewed-by: Jeremy Allison --- source4/rpc_server/dcerpc_server.c | 2 +- source4/rpc_server/dcerpc_server.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index e763b581f4d4..a79a56947720 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1107,7 +1107,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) DCERPC_BIND_TIME_KEEP_CONNECTION_ON_ORPHAN; } - call->conn->bind_time_features = a->reason.negotiate; + call->conn->assoc_group->bind_time_features = a->reason.negotiate; } /* diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index abfb5c0b8944..557883090af6 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -310,9 +310,6 @@ struct dcesrv_connection { */ const struct ndr_syntax_id *preferred_transfer; - /* the negotiated bind time features */ - uint16_t bind_time_features; - /* * This is used to block the connection during * pending authentication. @@ -359,6 +356,9 @@ struct dcesrv_assoc_group { /* parent context */ struct dcesrv_context *dce_ctx; + /* the negotiated bind time features */ + uint16_t bind_time_features; + /* Remote association group ID (if proxied) */ uint32_t proxied_id; }; -- 2.34.1