diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-04 09:57:07 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-02-13 11:54:16 +0100 |
| commit | cd0981b2d8d8726b035d28fd3a9ece9aebd8f376 (patch) | |
| tree | 660b76634035a2364c771b4e2c13d206e64b255b /source4/libnet | |
| parent | 98e2b3c28f05ee3c23d16c9b8eaae65959c93de1 (diff) | |
| download | samba-cd0981b2d8d8726b035d28fd3a9ece9aebd8f376.tar.gz samba-cd0981b2d8d8726b035d28fd3a9ece9aebd8f376.tar.xz samba-cd0981b2d8d8726b035d28fd3a9ece9aebd8f376.zip | |
s4:libnet: make use of dcerpc_binding_set_flags()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 20 | ||||
| -rw-r--r-- | source4/libnet/libnet_rpc.c | 6 | ||||
| -rw-r--r-- | source4/libnet/libnet_unbecome_dc.c | 5 |
3 files changed, 24 insertions, 7 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index 7116c36f489..9422172f693 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -1583,7 +1583,10 @@ static void becomeDC_drsuapi_connect_send(struct libnet_BecomeDC_state *s, } if (DEBUGLEVEL >= 10) { - drsuapi->binding->flags |= DCERPC_DEBUG_PRINT_BOTH; + c->status = dcerpc_binding_set_flags(drsuapi->binding, + DCERPC_DEBUG_PRINT_BOTH, + 0); + if (!composite_is_ok(c)) return; } creq = dcerpc_pipe_connect_b_send(s, drsuapi->binding, &ndr_table_drsuapi, @@ -2458,7 +2461,10 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq) if (!composite_is_ok(c)) return; if (DEBUGLEVEL >= 10) { - s->drsuapi2.binding->flags |= DCERPC_DEBUG_PRINT_BOTH; + c->status = dcerpc_binding_set_flags(s->drsuapi2.binding, + DCERPC_DEBUG_PRINT_BOTH, + 0); + if (!composite_is_ok(c)) return; } /* w2k3 uses the same assoc_group_id as on the first connection, so we do */ @@ -2532,7 +2538,10 @@ static void becomeDC_drsuapi2_bind_recv(struct tevent_req *subreq) if (!composite_is_ok(c)) return; if (DEBUGLEVEL >= 10) { - s->drsuapi3.binding->flags |= DCERPC_DEBUG_PRINT_BOTH; + c->status = dcerpc_binding_set_flags(s->drsuapi3.binding, + DCERPC_DEBUG_PRINT_BOTH, + 0); + if (!composite_is_ok(c)) return; } /* w2k3 uses the same assoc_group_id as on the first connection, so we do */ @@ -2540,7 +2549,10 @@ static void becomeDC_drsuapi2_bind_recv(struct tevent_req *subreq) c->status = dcerpc_binding_set_assoc_group_id(s->drsuapi3.binding, assoc_group_id); if (!composite_is_ok(c)) return; /* w2k3 uses the concurrent multiplex feature on the 3rd connection, so we do */ - s->drsuapi3.binding->flags |= DCERPC_CONCURRENT_MULTIPLEX; + c->status = dcerpc_binding_set_flags(s->drsuapi3.binding, + DCERPC_CONCURRENT_MULTIPLEX, + 0); + if (!composite_is_ok(c)) return; becomeDC_drsuapi_connect_send(s, &s->drsuapi3, becomeDC_drsuapi3_connect_recv); } diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c index 2ff4a38a5fa..db48ea3f7db 100644 --- a/source4/libnet/libnet_rpc.c +++ b/source4/libnet/libnet_rpc.c @@ -108,7 +108,8 @@ static struct composite_context* libnet_RpcConnectSrv_send(struct libnet_context switch (r->level) { case LIBNET_RPC_CONNECT_SERVER: case LIBNET_RPC_CONNECT_SERVER_ADDRESS: - b->flags = r->in.dcerpc_flags; + c->status = dcerpc_binding_set_flags(b, r->in.dcerpc_flags, 0); + if (!composite_is_ok(c)) return c; break; default: /* other types have already been checked before */ @@ -116,7 +117,8 @@ static struct composite_context* libnet_RpcConnectSrv_send(struct libnet_context } if (DEBUGLEVEL >= 10) { - b->flags |= DCERPC_DEBUG_PRINT_BOTH; + c->status = dcerpc_binding_set_flags(b, DCERPC_DEBUG_PRINT_BOTH, 0); + if (!composite_is_ok(c)) return c; } if (r->level == LIBNET_RPC_CONNECT_SERVER_ADDRESS) { diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index a46d1433bc6..b0fe07b0d74 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -551,7 +551,10 @@ static void unbecomeDC_drsuapi_connect_send(struct libnet_UnbecomeDC_state *s) if (!composite_is_ok(c)) return; if (DEBUGLEVEL >= 10) { - s->drsuapi.binding->flags |= DCERPC_DEBUG_PRINT_BOTH; + c->status = dcerpc_binding_set_flags(s->drsuapi.binding, + DCERPC_DEBUG_PRINT_BOTH, + 0); + if (!composite_is_ok(c)) return; } creq = dcerpc_pipe_connect_b_send(s, s->drsuapi.binding, &ndr_table_drsuapi, |