diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
| commit | a7109b183b555ee795c3e32c63e2647025705fc1 (patch) | |
| tree | bc118e6f1dd72466367a4aa9b31df08f253eaa07 /source4/rpc_server | |
| parent | 0f04beff337a936a66c86272ff79defd9e8ae173 (diff) | |
| parent | 9e64ed018e5aa84d802b01953b481fbb07eb00aa (diff) | |
| download | samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.gz samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.bz2 samba-a7109b183b555ee795c3e32c63e2647025705fc1.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/dcerpc_server.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 5f055ae342..d27a8b90de 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -648,7 +648,20 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | extra_flags; pkt.u.bind_ack.max_xmit_frag = 0x2000; pkt.u.bind_ack.max_recv_frag = 0x2000; - pkt.u.bind_ack.assoc_group_id = iface?call->context->assoc_group_id:0; + + /* + make it possible for iface->bind() to specify the assoc_group_id + This helps the openchange mapiproxy plugin to work correctly. + + metze + */ + if (call->context) { + pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id; + } else { + /* we better pick something - this chosen so as to send a non zero assoc_group_id (matching windows), it also matches samba3 */ + pkt.u.bind_ack.assoc_group_id = SAMBA_ASSOC_GROUP; + } + if (iface) { /* FIXME: Use pipe name as specified by endpoint instead of interface name */ pkt.u.bind_ack.secondary_address = talloc_asprintf(call, "\\PIPE\\%s", iface->name); |