r26639: librpc: Pass iconv convenience on from RPC connection to NDR library, so...
[bbaumbach/samba-autobuild/.git] / source4 / librpc / rpc / dcerpc_connect.c
index bd05498aedbd37d875a1dd208a046bf6745d9afd..63fd25dd1abd88750d7f3e1da34b3e32a8aea5b9 100644 (file)
@@ -31,6 +31,8 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "librpc/rpc/dcerpc.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
+#include "libcli/resolve/resolve.h"
 
 
 struct pipe_np_smb_state {
@@ -109,14 +111,14 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
        /* prepare smb connection parameters: we're connecting to IPC$ share on
           remote rpc server */
        conn->in.dest_host              = s->io.binding->host;
-       conn->in.port                   = 0;
+       conn->in.dest_ports                  = lp_smb_ports(global_loadparm);
        if (s->io.binding->target_hostname == NULL)
-               conn->in.called_name = "*SMBSERVER";
+               conn->in.called_name = "*SMBSERVER"; /* FIXME: This is invalid */
        else
                conn->in.called_name            = s->io.binding->target_hostname;
        conn->in.service                = "IPC$";
        conn->in.service_type           = NULL;
-       conn->in.workgroup              = lp_workgroup();
+       conn->in.workgroup              = lp_workgroup(global_loadparm);
 
        /*
         * provide proper credentials - user supplied, but allow a
@@ -126,9 +128,9 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
         */
        s->conn.in.credentials = s->io.creds;
        if (s->io.binding->flags & DCERPC_SCHANNEL) {
-               conn->in.fallback_to_anonymous  = True;
+               conn->in.fallback_to_anonymous  = true;
        } else {
-               conn->in.fallback_to_anonymous  = False;
+               conn->in.fallback_to_anonymous  = false;
        }
 
        /* send smb connect request */
@@ -204,8 +206,9 @@ static void continue_smb2_connect(struct composite_context *ctx)
    Initiate async open of a rpc connection request on SMB2 using
    the binding structure to determine the endpoint and options
 */
-static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_CTX *mem_ctx,
-                                                                       struct dcerpc_pipe_connect *io)
+static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(
+                                       TALLOC_CTX *mem_ctx,
+                                       struct dcerpc_pipe_connect *io)
 {
        struct composite_context *c;
        struct pipe_np_smb2_state *s;
@@ -229,12 +232,13 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_C
                s->io.creds = cli_credentials_init(mem_ctx);
                if (composite_nomem(s->io.creds, c)) return c;
 
-               cli_credentials_set_anonymous(s->io.creds);
-               cli_credentials_guess(s->io.creds);
+               cli_credentials_guess(s->io.creds, global_loadparm);
        }
 
        /* send smb2 connect request */
-       conn_req = smb2_connect_send(mem_ctx, s->io.binding->host, "IPC$", s->io.creds,
+       conn_req = smb2_connect_send(mem_ctx, s->io.binding->host, "IPC$", 
+                                    s->io.resolve_ctx,
+                                    s->io.creds,
                                     c->event_ctx);
        composite_continue(c, conn_req, continue_smb2_connect, c);
        return c;
@@ -305,7 +309,7 @@ static struct composite_context* dcerpc_pipe_connect_ncacn_ip_tcp_send(TALLOC_CT
 
        /* send pipe open request on tcp/ip */
        pipe_req = dcerpc_pipe_open_tcp_send(s->io.pipe->conn, s->host, s->target_hostname, 
-                                            s->port);
+                                            s->port, io->resolve_ctx);
        composite_continue(c, pipe_req, continue_pipe_open_ncacn_ip_tcp, c);
        return c;
 }
@@ -441,7 +445,8 @@ static struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *me
        s->io  = *io;
 
        /* send pipe open request */
-       pipe_req = dcerpc_pipe_open_pipe_send(s->io.pipe->conn, s->io.binding->endpoint);
+       pipe_req = dcerpc_pipe_open_pipe_send(s->io.pipe->conn, lp_ncalrpc_dir(global_loadparm), 
+                                             s->io.binding->endpoint);
        composite_continue(c, pipe_req, continue_pipe_open_ncalrpc, c);
        return c;
 }
@@ -464,6 +469,7 @@ struct pipe_connect_state {
        struct dcerpc_binding *binding;
        const struct ndr_interface_table *table;
        struct cli_credentials *credentials;
+       struct loadparm_context *lp_ctx;
 };
 
 
@@ -516,6 +522,7 @@ static void continue_connect(struct composite_context *c, struct pipe_connect_st
        pc.binding      = s->binding;
        pc.interface    = s->table;
        pc.creds        = s->credentials;
+       pc.resolve_ctx  = lp_resolve_context(global_loadparm);
 
        /* connect dcerpc pipe depending on required transport */
        switch (s->binding->transport) {
@@ -658,7 +665,7 @@ static void continue_pipe_connect(struct composite_context *c, struct pipe_conne
        }
 
        auth_bind_req = dcerpc_pipe_auth_send(s->pipe, s->binding, s->table,
-                                             s->credentials);
+                                             s->credentials, s->lp_ctx);
        composite_continue(c, auth_bind_req, continue_pipe_auth, c);
 }
 
@@ -698,7 +705,8 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
                                                     struct dcerpc_binding *binding,
                                                     const struct ndr_interface_table *table,
                                                     struct cli_credentials *credentials,
-                                                    struct event_context *ev)
+                                                    struct event_context *ev,
+                                                    struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        struct pipe_connect_state *s;
@@ -723,13 +731,14 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
        c->private_data = s;
 
        /* initialise dcerpc pipe structure */
-       s->pipe = dcerpc_pipe_init(c, ev);
+       s->pipe = dcerpc_pipe_init(c, ev, lp_iconv_convenience(lp_ctx));
        if (composite_nomem(s->pipe, c)) return c;
 
        /* store parameters in state structure */
        s->binding      = binding;
        s->table        = table;
        s->credentials  = credentials;
+       s->lp_ctx       = lp_ctx;
 
        event_add_timed(c->event_ctx, c,
                        timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
@@ -739,7 +748,8 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
        case NCA_UNKNOWN: {
                struct composite_context *binding_req;
                binding_req = dcerpc_epm_map_binding_send(c, s->binding, s->table,
-                                                         s->pipe->conn->event_ctx);
+                                                         s->pipe->conn->event_ctx,
+                                                         s->lp_ctx);
                composite_continue(c, binding_req, continue_map_binding, c);
                return c;
                }
@@ -750,7 +760,8 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
                if (!s->binding->endpoint) {
                        struct composite_context *binding_req;
                        binding_req = dcerpc_epm_map_binding_send(c, s->binding, s->table,
-                                                                 s->pipe->conn->event_ctx);
+                                                                 s->pipe->conn->event_ctx,
+                                                                 s->lp_ctx);
                        composite_continue(c, binding_req, continue_map_binding, c);
                        return c;
                }
@@ -794,12 +805,13 @@ NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
                               struct dcerpc_binding *binding,
                               const struct ndr_interface_table *table,
                               struct cli_credentials *credentials,
-                              struct event_context *ev)
+                              struct event_context *ev,
+                              struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        
        c = dcerpc_pipe_connect_b_send(parent_ctx, binding, table,
-                                      credentials, ev);
+                                      credentials, ev, lp_ctx);
        return dcerpc_pipe_connect_b_recv(c, parent_ctx, pp);
 }
 
@@ -821,7 +833,7 @@ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_ctx,
                                                   const char *binding,
                                                   const struct ndr_interface_table *table,
                                                   struct cli_credentials *credentials,
-                                                  struct event_context *ev)
+                                                  struct event_context *ev, struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        struct pipe_conn_state *s;
@@ -862,7 +874,7 @@ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_ctx,
           is established
         */
        pipe_conn_req = dcerpc_pipe_connect_b_send(c, b, table,
-                                                  credentials, ev);
+                                                  credentials, ev, lp_ctx);
        composite_continue(c, pipe_conn_req, continue_pipe_connect_b, c);
        return c;
 }
@@ -917,12 +929,12 @@ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
                             const char *binding,
                             const struct ndr_interface_table *table,
                             struct cli_credentials *credentials,
-                            struct event_context *ev)
+                            struct event_context *ev,
+                            struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        c = dcerpc_pipe_connect_send(parent_ctx, binding, 
-                                    table,
-                                    credentials, ev);
+                                    table, credentials, ev, lp_ctx);
        return dcerpc_pipe_connect_recv(c, parent_ctx, pp);
 }