s4:rpc_server: context_id fields of presentation contexts are just 16bit

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 025cb2027cb3f8687c3e5e48fbeae01eb940435f..fee67653a2fbd9aa0a118cbd68e2c63b0c8d469c 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -169,7 +169,7 @@ static struct dcesrv_endpoint *find_endpoint(struct dcesrv_context *dce_ctx,
   find a registered context_id from a bind or alter_context
 */
 static struct dcesrv_connection_context *dcesrv_find_context(struct dcesrv_connection *conn, 
-                                                                  uint32_t context_id)
+                                                            uint16_t context_id)
 {
        struct dcesrv_connection_context *c;
        for (c=conn->contexts;c;c=c->next) {
@@ -668,7 +668,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        struct data_blob_list_item *rep;
        NTSTATUS status;
        uint32_t result=0, reason=0;
-       uint32_t context_id;
+       uint16_t context_id;
        const struct dcesrv_interface *iface;
        uint32_t extra_flags = 0;
        uint16_t max_req = 0;
@@ -949,7 +949,7 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 /*
   handle a bind request
 */
-static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_t context_id)
+static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint16_t context_id)
 {
        uint32_t if_version, transfer_syntax_version;
        struct dcesrv_connection_context *context;

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 54187ee749fb184811cdf17340a6b1a030665d4e..8c13cbd7828d85f656c366a686c01e6a0a2ce8ac 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -173,7 +173,7 @@ struct dcesrv_auth {
 
 struct dcesrv_connection_context {
        struct dcesrv_connection_context *next, *prev;
-       uint32_t context_id;
+       uint16_t context_id;
 
        /* TODO: remove this legacy (for openchange) in master */
        struct dcesrv_assoc_group *assoc_group;