s4:librpc: do not use dcerpc_secondary_smb_xxx()
authorGregor Beck <gbeck@sernet.de>
Tue, 10 Dec 2013 10:31:02 +0000 (11:31 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 10 Feb 2014 08:07:30 +0000 (09:07 +0100)
source4/librpc/rpc/dcerpc_secondary.c

index e9ab7ba35fc14cf4f98ddd95100e504d1c1b92a1..da44b2696125d6028e54862c07edbb61e3f60715 100644 (file)
@@ -81,11 +81,20 @@ _PUBLIC_ struct composite_context* dcerpc_secondary_connection_send(struct dcerp
        /* open second dcerpc pipe using the same transport as for primary pipe */
        switch (s->pipe->conn->transport.transport) {
        case NCACN_NP:
-               pipe_smb_req = dcerpc_secondary_smb_send(s->pipe->conn, s->pipe2->conn,
+       {
+               struct smb_private *smb = talloc_get_type_abort(
+                       p->conn->transport.private_data, struct smb_private);
+
+               pipe_smb_req = dcerpc_pipe_open_smb_send(s->pipe2->conn,
+                                                        smb->conn,
+                                                        smb->session,
+                                                        smb->tcon,
+                                                        smb->timeout_msec,
                                                         s->binding->endpoint);
+
                composite_continue(c, pipe_smb_req, continue_open_smb, c);
                return c;
-
+       }
        case NCACN_IP_TCP:
                s->peer_addr = dcerpc_socket_peer_addr(s->pipe->conn, s);
                if (!s->peer_addr) {
@@ -126,7 +135,7 @@ static void continue_open_smb(struct composite_context *ctx)
        struct composite_context *c = talloc_get_type(ctx->async.private_data,
                                                      struct composite_context);
        
-       c->status = dcerpc_secondary_smb_recv(ctx);
+       c->status = dcerpc_pipe_open_smb_recv(ctx);
        if (!composite_is_ok(c)) return;
 
        continue_pipe_open(c);