r4587: fixed dcerpc_secondary_connection() for ncacn_ip_tcp
[samba.git] / source4 / librpc / rpc / dcerpc_util.c
index d8da1327d500688f646654fa074afa8f8f0912fc..6eac4b26b29f910ec021ad50962e536e45da7310 100644 (file)
@@ -4,6 +4,7 @@
    dcerpc utility functions
 
    Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Jelmer Vernooij 2004
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #include "includes.h"
-
-/*
-  this ndr_size_* stuff should really be auto-generated ....
-*/
-
-static size_t ndr_size_epm_floor(struct epm_floor *fl)
-{
-       size_t ret = 5;
-       if (fl->lhs.protocol == EPM_PROTOCOL_UUID) {
-               ret += 18;
-       } else {
-               ret += fl->lhs.info.lhs_data.length;
-       }
-       ret += fl->rhs.rhs_data.length;
-       return ret;
-}
-
-size_t ndr_size_epm_towers(struct epm_towers *towers)
-{
-       size_t ret = 2;
-       int i;
-       for (i=0;i<towers->num_floors;i++) {
-               ret += ndr_size_epm_floor(&towers->floors[i]);
-       }
-       return ret;
-}
-
-/*
-  work out what TCP port to use for a given interface on a given host
-*/
-NTSTATUS dcerpc_epm_map_tcp_port(const char *server, 
-                                const char *uuid, uint_t version,
-                                uint32_t *port)
-{
-       struct dcerpc_pipe *p;
-       NTSTATUS status;
-       struct epm_Map r;
-       struct policy_handle handle;
-       struct GUID guid;
-       struct epm_twr_t twr, *twr_r;
-
-       if (strcasecmp(uuid, DCERPC_EPMAPPER_UUID) == 0 ||
-           strcasecmp(uuid, DCERPC_MGMT_UUID) == 0) {
-               /* don't lookup epmapper via epmapper! */
-               *port = EPMAPPER_PORT;
-               return NT_STATUS_OK;
-       }
-
-       status = dcerpc_pipe_open_tcp(&p, server, EPMAPPER_PORT);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       /* we can use the pipes memory context here as we will have a short
-          lived connection */
-       status = dcerpc_bind_byuuid(p, p->mem_ctx, 
-                                   DCERPC_EPMAPPER_UUID,
-                                   DCERPC_EPMAPPER_VERSION);
-       if (!NT_STATUS_IS_OK(status)) {
-               dcerpc_pipe_close(p);
-               return status;
-       }
-
-       ZERO_STRUCT(handle);
-       ZERO_STRUCT(guid);
-
-       twr.towers.num_floors = 5;
-       twr.towers.floors = talloc(p->mem_ctx, sizeof(twr.towers.floors[0]) * 5);
-
-       /* what I'd like for christmas ... */
-
-       /* an RPC interface ... */
-       twr.towers.floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
-       GUID_from_string(uuid, &twr.towers.floors[0].lhs.info.uuid.uuid);
-       twr.towers.floors[0].lhs.info.uuid.version = version;
-       twr.towers.floors[0].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
-
-       /* encoded with NDR ... */
-       twr.towers.floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
-       GUID_from_string(NDR_GUID, &twr.towers.floors[1].lhs.info.uuid.uuid);
-       twr.towers.floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
-       twr.towers.floors[1].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
-
-       /* on an RPC connection ... */
-       twr.towers.floors[2].lhs.protocol = EPM_PROTOCOL_RPC_C;
-       twr.towers.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.towers.floors[2].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
-
-       /* on a TCP port ... */
-       twr.towers.floors[3].lhs.protocol = EPM_PROTOCOL_TCP;
-       twr.towers.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.towers.floors[3].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
-
-       /* on an IP link ... */
-       twr.towers.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
-       twr.towers.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.towers.floors[4].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 4);
-
-       /* with some nice pretty paper around it of course */
-       r.in.object = &guid;
-       r.in.map_tower = &twr;
-       r.in.entry_handle = &handle;
-       r.in.max_towers = 1;
-       r.out.entry_handle = &handle;
-
-       status = dcerpc_epm_Map(p, p->mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               dcerpc_pipe_close(p);
-               return status;
-       }
-       if (r.out.status != 0 || r.out.num_towers != 1) {
-               dcerpc_pipe_close(p);
-               return NT_STATUS_PORT_UNREACHABLE;
-       }
-
-       twr_r = r.out.towers[0].twr;
-       if (!twr_r) {
-               dcerpc_pipe_close(p);
-               return NT_STATUS_PORT_UNREACHABLE;
-       }
-
-       if (twr_r->towers.num_floors != 5 ||
-           twr_r->towers.floors[3].lhs.protocol != twr.towers.floors[3].lhs.protocol ||
-           twr_r->towers.floors[3].rhs.rhs_data.length != 2) {
-               dcerpc_pipe_close(p);
-               return NT_STATUS_PORT_UNREACHABLE;
-       }
-
-       *port = RSVAL(twr_r->towers.floors[3].rhs.rhs_data.data, 0);
-
-       dcerpc_pipe_close(p);
-
-       return NT_STATUS_OK;
-}
-
+#include "system/network.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
 
 /*
   find the pipe name for a local IDL interface
 */
 const char *idl_pipe_name(const char *uuid, uint32_t if_version)
 {
-       int i;
-       for (i=0;dcerpc_pipes[i];i++) {
-               if (strcasecmp(dcerpc_pipes[i]->uuid, uuid) == 0 &&
-                   dcerpc_pipes[i]->if_version == if_version) {
-                       return dcerpc_pipes[i]->name;
+       struct dcerpc_interface_list *l;
+       for (l=dcerpc_pipes;l;l=l->next) {
+               if (strcasecmp(l->table->uuid, uuid) == 0 &&
+                   l->table->if_version == if_version) {
+                       return l->table->name;
                }
        }
        return "UNKNOWN";
@@ -177,11 +45,11 @@ const char *idl_pipe_name(const char *uuid, uint32_t if_version)
 */
 int idl_num_calls(const char *uuid, uint32_t if_version)
 {
-       int i;
-       for (i=0;dcerpc_pipes[i];i++) {
-               if (strcasecmp(dcerpc_pipes[i]->uuid, uuid) == 0 &&
-                   dcerpc_pipes[i]->if_version == if_version) {
-                       return dcerpc_pipes[i]->num_calls;
+       struct dcerpc_interface_list *l;
+       for (l=dcerpc_pipes;l;l=l->next){
+               if (strcasecmp(l->table->uuid, uuid) == 0 &&
+                   l->table->if_version == if_version) {
+                       return l->table->num_calls;
                }
        }
        return -1;
@@ -193,10 +61,10 @@ int idl_num_calls(const char *uuid, uint32_t if_version)
 */
 const struct dcerpc_interface_table *idl_iface_by_name(const char *name)
 {
-       int i;
-       for (i=0;dcerpc_pipes[i];i++) {
-               if (strcasecmp(dcerpc_pipes[i]->name, name) == 0) {
-                       return dcerpc_pipes[i];
+       struct dcerpc_interface_list *l;
+       for (l=dcerpc_pipes;l;l=l->next) {
+               if (strcasecmp(l->table->name, name) == 0) {
+                       return l->table;
                }
        }
        return NULL;
@@ -207,17 +75,16 @@ const struct dcerpc_interface_table *idl_iface_by_name(const char *name)
 */
 const struct dcerpc_interface_table *idl_iface_by_uuid(const char *uuid)
 {
-       int i;
-       for (i=0;dcerpc_pipes[i];i++) {
-               if (strcasecmp(dcerpc_pipes[i]->uuid, uuid) == 0) {
-                       return dcerpc_pipes[i];
+       struct dcerpc_interface_list *l;
+       for (l=dcerpc_pipes;l;l=l->next) {
+               if (strcasecmp(l->table->uuid, uuid) == 0) {
+                       return l->table;
                }
        }
        return NULL;
 }
 
 
-
 /* 
    push a dcerpc_packet into a blob, potentially with auth info
 */
@@ -237,6 +104,10 @@ NTSTATUS dcerpc_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
+       if (pkt->pfc_flags & DCERPC_PFC_FLAG_ORPC) {
+               ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
+       }
+
        if (auth_info) {
                pkt->auth_length = auth_info->credentials.length;
        } else {
@@ -260,13 +131,42 @@ NTSTATUS dcerpc_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+#define MAX_PROTSEQ            10
 
 static const struct {
        const char *name;
        enum dcerpc_transport_t transport;
-} ncacn_transports[] = {
-       {"ncacn_np",     NCACN_NP},
-       {"ncacn_ip_tcp", NCACN_IP_TCP}
+       int num_protocols;
+       enum epm_protocol protseq[MAX_PROTSEQ];
+} transports[] = {
+       { "ncacn_np",     NCACN_NP, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NETBIOS }},
+       { "ncacn_ip_tcp", NCACN_IP_TCP, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP, EPM_PROTOCOL_IP } }, 
+       { "ncacn_http", NCACN_HTTP, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP, EPM_PROTOCOL_IP } }, 
+       { "ncadg_ip_udp", NCACN_IP_UDP, 3, 
+               { EPM_PROTOCOL_NCADG, EPM_PROTOCOL_UDP, EPM_PROTOCOL_IP } },
+       { "ncalrpc", NCALRPC, 2, 
+               { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE } },
+       { "ncacn_unix_stream", NCACN_UNIX_STREAM, 2, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_UNIX_DS } },
+       { "ncadg_unix_dgram", NCADG_UNIX_DGRAM, 2, 
+               { EPM_PROTOCOL_NCADG, EPM_PROTOCOL_UNIX_DS } },
+       { "ncacn_at_dsp", NCACN_AT_DSP, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_APPLETALK, EPM_PROTOCOL_DSP } },
+       { "ncadg_at_ddp", NCADG_AT_DDP, 3, 
+               { EPM_PROTOCOL_NCADG, EPM_PROTOCOL_APPLETALK, EPM_PROTOCOL_DDP } },
+       { "ncacn_vns_ssp", NCACN_VNS_SPP, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_STREETTALK, EPM_PROTOCOL_VINES_SPP } },
+       { "ncacn_vns_ipc", NCACN_VNS_IPC, 3, 
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_STREETTALK, EPM_PROTOCOL_VINES_IPC }, },
+       { "ncadg_ipx", NCADG_IPX, 2,
+               { EPM_PROTOCOL_NCADG, EPM_PROTOCOL_IPX },
+       },
+       { "ncacn_spx", NCACN_SPX, 2,
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SPX },
+       },
 };
 
 static const struct {
@@ -275,50 +175,71 @@ static const struct {
 } ncacn_options[] = {
        {"sign", DCERPC_SIGN},
        {"seal", DCERPC_SEAL},
-       {"schannel", DCERPC_SCHANNEL},
+       {"connect", DCERPC_CONNECT},
        {"validate", DCERPC_DEBUG_VALIDATE_BOTH},
        {"print", DCERPC_DEBUG_PRINT_BOTH},
+       {"padcheck", DCERPC_DEBUG_PAD_CHECK},
        {"bigendian", DCERPC_PUSH_BIGENDIAN}
 };
 
+
+
 /*
   form a binding string from a binding structure
 */
 const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b)
 {
-       char *s = NULL;
+       char *s = talloc_strdup(mem_ctx, "");
        int i;
        const char *t_name=NULL;
 
-       for (i=0;i<ARRAY_SIZE(ncacn_transports);i++) {
-               if (ncacn_transports[i].transport == b->transport) {
-                       t_name = ncacn_transports[i].name;
+       for (i=0;i<ARRAY_SIZE(transports);i++) {
+               if (transports[i].transport == b->transport) {
+                       t_name = transports[i].name;
                }
        }
        if (!t_name) {
                return NULL;
        }
 
-       s = talloc_asprintf(mem_ctx, "%s:%s:[", t_name, b->host);
+       if (!GUID_all_zero(&b->object)) { 
+               s = talloc_asprintf(s, "%s@",
+                                   GUID_string(mem_ctx, &b->object));
+       }
+
+       s = talloc_asprintf_append(s, "%s:", t_name);
        if (!s) return NULL;
 
+       if (b->host) {
+               s = talloc_asprintf_append(s, "%s", b->host);
+       }
+
+       if (!b->endpoint && !b->options && !b->flags) {
+               return s;
+       }
+
+       s = talloc_asprintf_append(s, "[");
+
+       if (b->endpoint) {
+               s = talloc_asprintf_append(s, "%s", b->endpoint);
+       }
+
        /* this is a *really* inefficent way of dealing with strings,
           but this is rarely called and the strings are always short,
           so I don't care */
        for (i=0;b->options && b->options[i];i++) {
-               s = talloc_asprintf(mem_ctx, "%s%s,", s, b->options[i]);
+               s = talloc_asprintf_append(s, ",%s", b->options[i]);
                if (!s) return NULL;
        }
+
        for (i=0;i<ARRAY_SIZE(ncacn_options);i++) {
                if (b->flags & ncacn_options[i].flag) {
-                       s = talloc_asprintf(mem_ctx, "%s%s,", s, ncacn_options[i].name);
+                       s = talloc_asprintf_append(s, ",%s", ncacn_options[i].name);
                        if (!s) return NULL;
                }
        }
-       if (s[strlen(s)-1] == ',') {
-               s[strlen(s)-1] = 0;
-       }
-       s = talloc_asprintf(mem_ctx, "%s]", s);
+
+       s = talloc_asprintf_append(s, "]");
 
        return s;
 }
@@ -328,81 +249,92 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
 */
 NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding *b)
 {
-       char *part1, *part2, *part3;
+       char *options, *type;
        char *p;
        int i, j, comma_count;
 
+       p = strchr(s, '@');
+
+       if (p && PTR_DIFF(p, s) == 36) { /* 36 is the length of a UUID */
+               NTSTATUS status;
+
+               status = GUID_from_string(s, &b->object);
+
+               if (NT_STATUS_IS_ERR(status)) {
+                       DEBUG(0, ("Failed parsing UUID\n"));
+                       return status;
+               }
+
+               s = p + 1;
+       } else {
+               ZERO_STRUCT(b->object);
+       }
+
+       b->object_version = 0;
+
        p = strchr(s, ':');
        if (!p) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       part1 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-       if (!part1) {
+
+       type = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
+       if (!type) {
                return NT_STATUS_NO_MEMORY;
        }
-       s = p+1;
 
-       p = strchr(s, ':');
-       if (!p) {
-               p = strchr(s, '[');
-               if (p) {
-                       part2 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-                       part3 = talloc_strdup(mem_ctx, p+1);
-                       if (part3[strlen(part3)-1] != ']') {
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-                       part3[strlen(part3)-1] = 0;
-               } else {
-                       part2 = talloc_strdup(mem_ctx, s);
-                       part3 = NULL;
+       for (i=0;i<ARRAY_SIZE(transports);i++) {
+               if (strcasecmp(type, transports[i].name) == 0) {
+                       b->transport = transports[i].transport;
+                       break;
                }
-       } else {
-               part2 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-               part3 = talloc_strdup(mem_ctx, p+1);
        }
-       if (!part2) {
-               return NT_STATUS_NO_MEMORY;
+       if (i==ARRAY_SIZE(transports)) {
+               DEBUG(0,("Unknown dcerpc transport '%s'\n", type));
+               return NT_STATUS_INVALID_PARAMETER;
        }
+       
+       s = p+1;
 
-       for (i=0;i<ARRAY_SIZE(ncacn_transports);i++) {
-               if (strcasecmp(part1, ncacn_transports[i].name) == 0) {
-                       b->transport = ncacn_transports[i].transport;
-                       break;
+       p = strchr(s, '[');
+       if (p) {
+               b->host = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
+               options = talloc_strdup(mem_ctx, p+1);
+               if (options[strlen(options)-1] != ']') {
+                       return NT_STATUS_INVALID_PARAMETER;
                }
+               options[strlen(options)-1] = 0;
+       } else {
+               b->host = talloc_strdup(mem_ctx, s);
+               options = NULL;
        }
-       if (i==ARRAY_SIZE(ncacn_transports)) {
-               DEBUG(0,("Unknown dcerpc transport '%s'\n", part1));
-               return NT_STATUS_INVALID_PARAMETER;
+
+       if (!b->host) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       b->host = part2;
        b->options = NULL;
        b->flags = 0;
+       b->endpoint = NULL;
 
-       if (!part3) {
+       if (!options) {
                return NT_STATUS_OK;
        }
 
-       /* the [] brackets are optional */
-       if (*part3 == '[' && part3[strlen(part3)-1] == ']') {
-               part3++;
-               part3[strlen(part3)-1] = 0;
-       }
+       comma_count = count_chars(options, ',');
 
-       comma_count = count_chars(part3, ',');
        b->options = talloc_array_p(mem_ctx, const char *, comma_count+2);
        if (!b->options) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; (p = strchr(part3, ',')); i++) {
-               b->options[i] = talloc_strndup(mem_ctx, part3, PTR_DIFF(p, part3));
+       for (i=0; (p = strchr(options, ',')); i++) {
+               b->options[i] = talloc_strndup(mem_ctx, options, PTR_DIFF(p, options));
                if (!b->options[i]) {
                        return NT_STATUS_NO_MEMORY;
                }
-               part3 = p+1;
+               options = p+1;
        }
-       b->options[i] = part3;
+       b->options[i] = options;
        b->options[i+1] = NULL;
 
        /* some options are pre-parsed for convenience */
@@ -419,7 +351,423 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_
                        }
                }
        }
+
+       if (b->options[0]) {
+               /* Endpoint is first option */
+               b->endpoint = b->options[0];
+               if (strlen(b->endpoint) == 0) b->endpoint = NULL;
+
+               for (i=0;b->options[i];i++) {
+                       b->options[i] = b->options[i+1];
+               }
+       }
+
+       if (b->options[0] == NULL)
+               b->options = NULL;
+       
+       return NT_STATUS_OK;
+}
+
+const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor)
+{
+       switch (floor->lhs.protocol) {
+       case EPM_PROTOCOL_TCP:
+               if (floor->rhs.tcp.port == 0) return NULL;
+               return talloc_asprintf(mem_ctx, "%d", floor->rhs.tcp.port);
+               
+       case EPM_PROTOCOL_UDP:
+               if (floor->rhs.udp.port == 0) return NULL;
+               return talloc_asprintf(mem_ctx, "%d", floor->rhs.udp.port);
+
+       case EPM_PROTOCOL_HTTP:
+               if (floor->rhs.http.port == 0) return NULL;
+               return talloc_asprintf(mem_ctx, "%d", floor->rhs.http.port);
+
+       case EPM_PROTOCOL_IP:
+               if (floor->rhs.ip.address == 0) {
+                       return NULL; 
+               }
+
+               {
+                       struct ipv4_addr in;
+                       in.addr = htonl(floor->rhs.ip.address);
+                       return talloc_strdup(mem_ctx, sys_inet_ntoa(in));
+               }
+
+       case EPM_PROTOCOL_NCACN:
+               return NULL;
+
+       case EPM_PROTOCOL_NCADG:
+               return NULL;
+
+       case EPM_PROTOCOL_SMB:
+               if (strlen(floor->rhs.smb.unc) == 0) return NULL;
+               return talloc_strdup(mem_ctx, floor->rhs.smb.unc);
+
+       case EPM_PROTOCOL_PIPE:
+               if (strlen(floor->rhs.pipe.path) == 0) return NULL;
+               return talloc_strdup(mem_ctx, floor->rhs.pipe.path);
+
+       case EPM_PROTOCOL_NETBIOS:
+               if (strlen(floor->rhs.netbios.name) == 0) return NULL;
+               return talloc_strdup(mem_ctx, floor->rhs.netbios.name);
+
+       case EPM_PROTOCOL_NCALRPC:
+               return NULL;
+               
+       case EPM_PROTOCOL_VINES_SPP:
+               return talloc_asprintf(mem_ctx, "%d", floor->rhs.vines_spp.port);
+               
+       case EPM_PROTOCOL_VINES_IPC:
+               return talloc_asprintf(mem_ctx, "%d", floor->rhs.vines_ipc.port);
+               
+       case EPM_PROTOCOL_STREETTALK:
+               return talloc_strdup(mem_ctx, floor->rhs.streettalk.streettalk);
+               
+       case EPM_PROTOCOL_UNIX_DS:
+               if (strlen(floor->rhs.unix_ds.path) == 0) return NULL;
+               return talloc_strdup(mem_ctx, floor->rhs.unix_ds.path);
+               
+       case EPM_PROTOCOL_NULL:
+               return NULL;
+
+       default:
+               DEBUG(0,("Unsupported lhs protocol %d\n", floor->lhs.protocol));
+               break;
+       }
+
+       return NULL;
+}
+
+static NTSTATUS dcerpc_floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor,  const char *data)
+{
+       switch (floor->lhs.protocol) {
+       case EPM_PROTOCOL_TCP:
+               floor->rhs.tcp.port = atoi(data);
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_UDP:
+               floor->rhs.udp.port = atoi(data);
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_HTTP:
+               floor->rhs.http.port = atoi(data);
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_IP:
+               if (strlen(data) > 0) {
+                       floor->rhs.ip.address = ntohl(interpret_addr(data));
+               } else {
+                       floor->rhs.ip.address = 0;
+               }
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_NCACN:
+               floor->rhs.ncacn.minor_version = 0;
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_NCADG:
+               floor->rhs.ncadg.minor_version = 0;
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_SMB:
+               floor->rhs.smb.unc = talloc_strdup(mem_ctx, data);
+               if (!floor->rhs.smb.unc) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_PIPE:
+               floor->rhs.pipe.path = talloc_strdup(mem_ctx, data);
+               if (!floor->rhs.pipe.path) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_NETBIOS:
+               floor->rhs.netbios.name = talloc_strdup(mem_ctx, data);
+               if (!floor->rhs.netbios.name) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               return NT_STATUS_OK;
+
+       case EPM_PROTOCOL_NCALRPC:
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_VINES_SPP:
+               floor->rhs.vines_spp.port = atoi(data);
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_VINES_IPC:
+               floor->rhs.vines_ipc.port = atoi(data);
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_STREETTALK:
+               floor->rhs.streettalk.streettalk = talloc_strdup(mem_ctx, data);
+               if (!floor->rhs.streettalk.streettalk) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_UNIX_DS:
+               floor->rhs.unix_ds.path = talloc_strdup(mem_ctx, data);
+               if (!floor->rhs.unix_ds.path) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               return NT_STATUS_OK;
+               
+       case EPM_PROTOCOL_NULL:
+               return NT_STATUS_OK;
+
+       default:
+               DEBUG(0,("Unsupported lhs protocol %d\n", floor->lhs.protocol));
+               break;
+       }
+
+       return NT_STATUS_NOT_SUPPORTED;
+}
+
+enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot)
+{
+       int i;
+
+       /* Find a transport that has 'prot' as 4th protocol */
+       for (i=0;i<ARRAY_SIZE(transports);i++) {
+               if (transports[i].num_protocols >= 2 && 
+                       transports[i].protseq[1] == prot) {
+                       return transports[i].transport;
+               }
+       }
+       
+       /* Unknown transport */
+       return -1;
+}
+
+enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower)
+{
+       int i;
+
+       /* Find a transport that matches this tower */
+       for (i=0;i<ARRAY_SIZE(transports);i++) {
+               int j;
+               if (transports[i].num_protocols != tower->num_floors - 2) {
+                       continue; 
+               }
+
+               for (j = 0; j < transports[i].num_protocols; j++) {
+                       if (transports[i].protseq[j] != tower->floors[j+2].lhs.protocol) {
+                               break;
+                       }
+               }
+
+               if (j == transports[i].num_protocols) {
+                       return transports[i].transport;
+               }
+       }
+       
+       /* Unknown transport */
+       return -1;
+}
+
+NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower, struct dcerpc_binding *binding)
+{
+       ZERO_STRUCT(binding->object);
+       binding->options = NULL;
+       binding->host = NULL;
+       binding->flags = 0;
+
+       binding->transport = dcerpc_transport_by_tower(tower);
+
+       if (binding->transport == -1) {
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+
+       if (tower->num_floors < 1) {
+               return NT_STATUS_OK;
+       }
+
+       /* Set object uuid */
+       binding->object = tower->floors[0].lhs.info.uuid.uuid;
+       binding->object_version = tower->floors[0].lhs.info.uuid.version;
+
+       /* Ignore floor 1, it contains the NDR version info */
+       
+       binding->options = NULL;
+
+       /* Set endpoint */
+       if (tower->num_floors >= 4) {
+               binding->endpoint = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[3]);
+       } else {
+               binding->endpoint = NULL;
+       }
+
+       /* Set network address */
+       if (tower->num_floors >= 5) {
+               binding->host = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[4]);
+       }
+       return NT_STATUS_OK;
+}
+
+NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding, struct epm_tower *tower)
+{
+       const enum epm_protocol *protseq = NULL;
+       int num_protocols = -1, i;
+       NTSTATUS status;
+       
+       /* Find transport */
+       for (i=0;i<ARRAY_SIZE(transports);i++) {
+               if (transports[i].transport == binding->transport) {
+                       protseq = transports[i].protseq;
+                       num_protocols = transports[i].num_protocols;
+                       break;
+               }
+       }
+
+       if (num_protocols == -1) {
+               DEBUG(0, ("Unable to find transport with id '%d'\n", binding->transport));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       tower->num_floors = 2 + num_protocols;
+       tower->floors = talloc_array_p(mem_ctx, struct epm_floor, tower->num_floors);
+
+       /* Floor 0 */
+       tower->floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
+       tower->floors[0].lhs.info.uuid.uuid = binding->object;
+       tower->floors[0].lhs.info.uuid.version = binding->object_version;
+       tower->floors[0].rhs.uuid.unknown = 0;
+       
+       /* Floor 1 */
+       tower->floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
+       tower->floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
+       tower->floors[1].rhs.uuid.unknown = 0;
+       status = GUID_from_string(NDR_GUID, &tower->floors[1].lhs.info.uuid.uuid);
+       if (NT_STATUS_IS_ERR(status)) {
+               return status;
+       }
+
+       /* Floor 2 to num_protocols */
+       for (i = 0; i < num_protocols; i++) {
+               tower->floors[2 + i].lhs.protocol = protseq[i];
+               tower->floors[2 + i].lhs.info.lhs_data = data_blob_talloc(mem_ctx, NULL, 0);
+               ZERO_STRUCT(tower->floors[2 + i].rhs);
+               dcerpc_floor_set_rhs_data(mem_ctx, &tower->floors[2 + i], "");
+       }
+
+       /* The 4th floor contains the endpoint */
+       if (num_protocols >= 2 && binding->endpoint) {
+               status = dcerpc_floor_set_rhs_data(mem_ctx, &tower->floors[3], binding->endpoint);
+               if (NT_STATUS_IS_ERR(status)) {
+                       return status;
+               }
+       }
+       
+       /* The 5th contains the network address */
+       if (num_protocols >= 3 && binding->host) {
+               status = dcerpc_floor_set_rhs_data(mem_ctx, &tower->floors[4], binding->host);
+               if (NT_STATUS_IS_ERR(status)) {
+                       return status;
+               }
+       }
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
+                                const char *uuid, uint_t version)
+{
+       struct dcerpc_pipe *p;
+       NTSTATUS status;
+       struct epm_Map r;
+       struct policy_handle handle;
+       struct GUID guid;
+       struct epm_twr_t twr, *twr_r;
+       struct dcerpc_binding epmapper_binding;
+       const struct dcerpc_interface_table *table = idl_iface_by_uuid(uuid);
+       int i;
+
+       /* First, check if there is a default endpoint specified in the IDL */
+
+       if (table) {
+               struct dcerpc_binding default_binding;
+               
+               /* Find one of the default pipes for this interface */
+               for (i = 0; i < table->endpoints->count; i++) {
+                       status = dcerpc_parse_binding(mem_ctx, table->endpoints->names[i], &default_binding);
+
+                       if (NT_STATUS_IS_OK(status) && default_binding.transport == binding->transport && default_binding.endpoint) {
+                               binding->endpoint = talloc_strdup(mem_ctx, default_binding.endpoint);   
+                               return NT_STATUS_OK;
+                       }
+               }
+       }
+
+
+       ZERO_STRUCT(epmapper_binding);
+       epmapper_binding.transport = binding->transport;
+       epmapper_binding.host = binding->host;
+       epmapper_binding.options = NULL;
+       epmapper_binding.flags = 0;
+       epmapper_binding.endpoint = NULL;
        
+       status = dcerpc_pipe_connect_b(&p,
+                                       &epmapper_binding,
+                                  DCERPC_EPMAPPER_UUID,
+                                  DCERPC_EPMAPPER_VERSION,
+                                  NULL, NULL, NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       ZERO_STRUCT(handle);
+       ZERO_STRUCT(guid);
+
+       status = GUID_from_string(uuid, &binding->object);
+       if (NT_STATUS_IS_ERR(status)) {
+               return status;
+       }
+
+       binding->object_version = version;
+
+       status = dcerpc_binding_build_tower(p, binding, &twr.tower);
+       if (NT_STATUS_IS_ERR(status)) {
+               return status;
+       }
+
+       /* with some nice pretty paper around it of course */
+       r.in.object = &guid;
+       r.in.map_tower = &twr;
+       r.in.entry_handle = &handle;
+       r.in.max_towers = 1;
+       r.out.entry_handle = &handle;
+
+       status = dcerpc_epm_Map(p, p, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               dcerpc_pipe_close(p);
+               return status;
+       }
+       if (r.out.result != 0 || r.out.num_towers != 1) {
+               dcerpc_pipe_close(p);
+               return NT_STATUS_PORT_UNREACHABLE;
+       }
+
+       twr_r = r.out.towers[0].twr;
+       if (!twr_r) {
+               dcerpc_pipe_close(p);
+               return NT_STATUS_PORT_UNREACHABLE;
+       }
+
+       if (twr_r->tower.num_floors != twr.tower.num_floors ||
+           twr_r->tower.floors[3].lhs.protocol != twr.tower.floors[3].lhs.protocol) {
+               dcerpc_pipe_close(p);
+               return NT_STATUS_PORT_UNREACHABLE;
+       }
+
+       binding->endpoint = dcerpc_floor_get_rhs_data(mem_ctx, &twr_r->tower.floors[3]);
+
+       dcerpc_pipe_close(p);
+
        return NT_STATUS_OK;
 }
 
@@ -436,82 +784,158 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
 {
        NTSTATUS status;
        BOOL retry;
-       struct cli_state *cli;
-       const char *pipe_name;
+       struct smbcli_state *cli;
+       const char *pipe_name = NULL;
+       TALLOC_CTX *mem_ctx = talloc_init("dcerpc_pipe_connect_ncacn_np");
        
-       if (!binding->options || !binding->options[0]) {
-               const struct dcerpc_interface_table *table = idl_iface_by_uuid(pipe_uuid);
-               if (!table) {
-                       DEBUG(0,("Unknown interface endpoint '%s'\n", pipe_uuid));
-                       return NT_STATUS_INVALID_PARAMETER;
+       /* Look up identifier using the epmapper */
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(mem_ctx, binding, pipe_uuid, pipe_version);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("Failed to map DCERPC/TCP NCACN_NP pipe for '%s' - %s\n", 
+                                pipe_uuid, nt_errstr(status)));
+                       talloc_destroy(mem_ctx);
+                       return status;
                }
-               /* only try the first endpoint for now */
-               pipe_name = table->endpoints->names[0];
-       } else {
-               pipe_name = binding->options[0];
+               DEBUG(1,("Mapped to DCERPC/NP pipe %s\n", binding->endpoint));
        }
 
-       if (strncasecmp(pipe_name, "\\pipe\\", 6) == 0) {
-               pipe_name += 6;
+       pipe_name = binding->endpoint;
+
+       if (!strncasecmp(pipe_name, "/pipe/", 6) || 
+               !strncasecmp(pipe_name, "\\pipe\\", 6)) {
+               pipe_name+=6;
        }
-       if (strncasecmp(pipe_name, "/pipe/", 6) == 0) {
-               pipe_name += 6;
+
+       if (pipe_name[0] != '\\') {
+               pipe_name = talloc_asprintf(mem_ctx, "\\%s", pipe_name);
+       }
+       
+       if (!username || !username[0] || 
+           (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = smbcli_full_connection(NULL, &cli, lp_netbios_name(),
+                                            binding->host, NULL, 
+                                            "ipc$", "?????", 
+                                            "", "", NULL, 0, &retry);
+       } else {
+               status = smbcli_full_connection(NULL, &cli, lp_netbios_name(),
+                                            binding->host, NULL, 
+                                            "ipc$", "?????", 
+                                            username, domain,
+                                            password, 0, &retry);
        }
-           
-       status = cli_full_connection(&cli, lp_netbios_name(),
-                                    binding->host, NULL, 
-                                    "ipc$", "?????", 
-                                    username, username[0]?domain:"",
-                                    password, 0, &retry);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to connect to %s - %s\n", binding->host, nt_errstr(status)));
+               talloc_destroy(mem_ctx);
                return status;
        }
 
        status = dcerpc_pipe_open_smb(p, cli->tree, pipe_name);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to open pipe %s - %s\n", pipe_name, nt_errstr(status)));
-               cli_tdis(cli);
-               cli_shutdown(cli);
-                return status;
-        }
+               smbcli_tdis(cli);
+               smbcli_shutdown(cli);
+               talloc_destroy(mem_ctx);
+               return status;
+       }
        
        /* this ensures that the reference count is decremented so
           a pipe close will really close the link */
-       cli_tree_close(cli->tree);
-       
+       talloc_steal(*p, cli);
+
        (*p)->flags = binding->flags;
 
-       if (binding->flags & DCERPC_SCHANNEL) {
-               const char *trust_password = secrets_fetch_machine_password();
-               if (!trust_password) {
-                       DEBUG(0,("Unable to fetch machine password\n"));
-                       goto done;
-               }
+       /* remember the binding string for possible secondary connections */
+       (*p)->binding_string = dcerpc_binding_string((*p), binding);
+
+       talloc_destroy(mem_ctx);
+
+       if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) {
                status = dcerpc_bind_auth_schannel(*p, pipe_uuid, pipe_version, 
-                                                  lp_workgroup(), 
-                                                  lp_netbios_name(), 
-                                                  trust_password);
-       } else if (binding->flags & (DCERPC_SIGN | DCERPC_SEAL)) {
+                                                  domain, username, password);
+       } else if (username && username[0] &&
+                  (binding->flags & (DCERPC_CONNECT|DCERPC_SIGN|DCERPC_SEAL))) {
                status = dcerpc_bind_auth_ntlm(*p, pipe_uuid, pipe_version, domain, username, password);
        } else {    
                status = dcerpc_bind_auth_none(*p, pipe_uuid, pipe_version);
+
        }
 
-done:
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to bind to uuid %s - %s\n", pipe_uuid, nt_errstr(status)));
                dcerpc_pipe_close(*p);
+               *p = NULL;
                return status;
        }
 
        return NT_STATUS_OK;
 }
 
+/* open a rpc connection to a rpc pipe on SMP using the binding
+   structure to determine the endpoint and options */
+static NTSTATUS dcerpc_pipe_connect_ncalrpc(struct dcerpc_pipe **p, 
+                                                struct dcerpc_binding *binding,
+                                                const char *pipe_uuid, 
+                                                uint32_t pipe_version,
+                                                const char *domain,
+                                                const char *username,
+                                                const char *password)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_init("dcerpc_pipe_connect_ncalrpc");
+
+       /* Look up identifier using the epmapper */
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(mem_ctx, binding, pipe_uuid, pipe_version);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("Failed to map DCERPC/TCP NCALRPC identifier for '%s' - %s\n", 
+                                pipe_uuid, nt_errstr(status)));
+                       talloc_destroy(mem_ctx);
+                       return status;
+               }
+               DEBUG(1,("Mapped to DCERPC/LRPC identifier %s\n", binding->endpoint));
+       }
+
+       status = dcerpc_pipe_open_pipe(p, binding->endpoint);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to open ncalrpc pipe '%s' - %s\n", binding->endpoint, nt_errstr(status)));
+               talloc_destroy(mem_ctx);
+               return status;
+    }
+
+       (*p)->flags = binding->flags;
+
+       /* remember the binding string for possible secondary connections */
+       (*p)->binding_string = dcerpc_binding_string((*p), binding);
+
+       if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = dcerpc_bind_auth_schannel(*p, pipe_uuid, pipe_version, 
+                                                  domain, username, password);
+       } else if (username && username[0]) {
+               status = dcerpc_bind_auth_ntlm(*p, pipe_uuid, pipe_version, domain, username, password);
+       } else {    
+               status = dcerpc_bind_auth_none(*p, pipe_uuid, pipe_version);
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to bind to uuid %s - %s\n", 
+                        pipe_uuid, nt_errstr(status)));
+               dcerpc_pipe_close(*p);
+               *p = NULL;
+               talloc_destroy(mem_ctx);
+               return status;
+       }
+       talloc_destroy(mem_ctx);
+    return status;
+}
+
+
 
 /* open a rpc connection to a rpc pipe on SMP using the binding
    structure to determine the endpoint and options */
-static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p, 
+static NTSTATUS dcerpc_pipe_connect_ncacn_unix_stream(struct dcerpc_pipe **p, 
                                                 struct dcerpc_binding *binding,
                                                 const char *pipe_uuid, 
                                                 uint32_t pipe_version,
@@ -520,48 +944,97 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
                                                 const char *password)
 {
        NTSTATUS status;
-       uint32_t port = 0;
 
-       if (binding->options && binding->options[0]) {
-               port = atoi(binding->options[0]);
+       if (!binding->endpoint) {
+               DEBUG(0, ("Path to unix socket not specified\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       status = dcerpc_pipe_open_unix_stream(p, binding->endpoint);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to open unix socket %s - %s\n", 
+                        binding->endpoint, nt_errstr(status)));
+                return status;
+       }
+
+       (*p)->flags = binding->flags;
+
+       /* remember the binding string for possible secondary connections */
+       (*p)->binding_string = dcerpc_binding_string((*p), binding);
+
+       if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = dcerpc_bind_auth_schannel(*p, pipe_uuid, pipe_version, 
+                                                  domain, username, password);
+       } else if (username && username[0]) {
+               status = dcerpc_bind_auth_ntlm(*p, pipe_uuid, pipe_version, domain, username, password);
+       } else {    
+               status = dcerpc_bind_auth_none(*p, pipe_uuid, pipe_version);
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to bind to uuid %s - %s\n", 
+                        pipe_uuid, nt_errstr(status)));
+               dcerpc_pipe_close(*p);
+               *p = NULL;
+               return status;
        }
+    return status;
+}
 
-       if (port == 0) {
-               status = dcerpc_epm_map_tcp_port(binding->host, 
-                                                pipe_uuid, pipe_version,
-                                                &port);
+/* open a rpc connection to a rpc pipe on SMP using the binding
+   structure to determine the endpoint and options */
+static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p, 
+                                                struct dcerpc_binding *binding,
+                                                const char *pipe_uuid, 
+                                                uint32_t pipe_version,
+                                                const char *domain,
+                                                const char *username,
+                                                const char *password)
+{
+       NTSTATUS status;
+       uint32_t port = 0;
+       TALLOC_CTX *mem_ctx = talloc_init("connect_ncacn_ip_tcp");
+
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(mem_ctx, binding, 
+                                                pipe_uuid, pipe_version);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0,("Failed to map DCERPC/TCP port for '%s' - %s\n", 
                                 pipe_uuid, nt_errstr(status)));
                        return status;
                }
-               DEBUG(1,("Mapped to DCERPC/TCP port %u\n", port));
+               DEBUG(1,("Mapped to DCERPC/TCP port %s\n", binding->endpoint));
        }
 
+       port = atoi(binding->endpoint);
+
        status = dcerpc_pipe_open_tcp(p, binding->host, port);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to connect to %s:%d\n", binding->host, port));
+               DEBUG(0,("Failed to connect to %s:%d - %s\n", 
+                        binding->host, port, nt_errstr(status)));
                 return status;
         }
 
-       /* it doesn't seem to work to do a null NTLMSSP session without either sign
-          or seal, so force signing if we are doing ntlmssp */
-       if (username[0] && !(binding->flags & (DCERPC_SIGN|DCERPC_SEAL))) {
-               binding->flags |= DCERPC_SIGN;
-       }
-
        (*p)->flags = binding->flags;
 
-       if (!(binding->flags & (DCERPC_SIGN|DCERPC_SEAL)) && !username[0]) {
+       /* remember the binding string for possible secondary connections */
+       (*p)->binding_string = dcerpc_binding_string((*p), binding);
+
+       if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = dcerpc_bind_auth_schannel(*p, pipe_uuid, pipe_version, 
+                                                  domain, username, password);
+       } else if (username && username[0]) {
+               status = dcerpc_bind_auth_ntlm(*p, pipe_uuid, pipe_version, domain, username, password);
+       } else {    
                status = dcerpc_bind_auth_none(*p, pipe_uuid, pipe_version);
-       } else {
-               status = dcerpc_bind_auth_ntlm(*p, pipe_uuid, pipe_version,
-                                              domain, username, password);
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to bind to uuid %s - %s\n", pipe_uuid, nt_errstr(status)));
+               DEBUG(0,("Failed to bind to uuid %s - %s\n", 
+                        pipe_uuid, nt_errstr(status)));
                dcerpc_pipe_close(*p);
+               *p = NULL;
                return status;
        }
  
@@ -590,11 +1063,14 @@ NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p,
                status = dcerpc_pipe_connect_ncacn_ip_tcp(p, binding, pipe_uuid, pipe_version,
                                                          domain, username, password);
                break;
-       }
-
-       /* remember the binding string for possible secondary connections */
-       if (NT_STATUS_IS_OK(status)) {
-               (*p)->binding_string = dcerpc_binding_string((*p)->mem_ctx, binding);
+       case NCACN_UNIX_STREAM:
+               status = dcerpc_pipe_connect_ncacn_unix_stream(p, binding, pipe_uuid, pipe_version, domain, username, password);
+               break;
+       case NCALRPC:
+               status = dcerpc_pipe_connect_ncalrpc(p, binding, pipe_uuid, pipe_version, domain, username, password);
+               break;
+       default:
+               return NT_STATUS_NOT_SUPPORTED;
        }
 
        return status;
@@ -635,28 +1111,58 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p,
 
 
 /*
-  create a secondary dcerpc connection on SMB
-  the secondary connection will be on the same SMB connection, but
-  use a new fnum
+  create a secondary dcerpc connection from a primary connection
+
+  if the primary is a SMB connection then the secondary connection
+  will be on the same SMB connection, but use a new fnum
 */
-NTSTATUS dcerpc_secondary_smb(struct dcerpc_pipe *p, struct dcerpc_pipe **p2,
-                             const char *pipe_name,
-                             const char *pipe_uuid,
-                             uint32_t pipe_version)
+NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe **p2,
+                                    const char *pipe_name,
+                                    const char *pipe_uuid,
+                                    uint32_t pipe_version)
 {
-       NTSTATUS status;
-       struct cli_tree *tree;
+       struct smbcli_tree *tree;
+       NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
+       struct dcerpc_binding b;
 
-       tree = dcerpc_smb_tree(p);
-       if (!tree) {
-               return NT_STATUS_INVALID_PARAMETER;
+       switch (p->transport.transport) {
+       case NCACN_NP:
+               tree = dcerpc_smb_tree(p);
+               if (!tree) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               status = dcerpc_pipe_open_smb(p2, tree, pipe_name);
+               break;
+
+       case NCACN_IP_TCP:
+               status = dcerpc_parse_binding(p, p->binding_string, &b);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+               b.flags &= ~DCERPC_AUTH_OPTIONS;
+               status = dcerpc_pipe_open_tcp(p2, b.host, atoi(b.endpoint));
+               break;
+
+       case NCALRPC:
+               status = dcerpc_parse_binding(p, p->binding_string, &b);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+               b.flags &= ~DCERPC_AUTH_OPTIONS;
+               status = dcerpc_pipe_connect_ncalrpc(p2, &b, pipe_uuid, pipe_version, NULL, NULL, NULL);
+               break;
+
+       default:
+               return NT_STATUS_NOT_SUPPORTED;
        }
 
-       status = dcerpc_pipe_open_smb(p2, tree, pipe_name);
        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-       
+               return status;
+       }
+
+       talloc_steal(p, *p2);
+
        (*p2)->flags = p->flags;
 
        status = dcerpc_bind_auth_none(*p2, pipe_uuid, pipe_version);
@@ -667,27 +1173,55 @@ NTSTATUS dcerpc_secondary_smb(struct dcerpc_pipe *p, struct dcerpc_pipe **p2,
        return NT_STATUS_OK;
 }
 
+NTSTATUS dcerpc_generic_session_key(struct dcerpc_pipe *p,
+                                   DATA_BLOB *session_key)
+{
+       /* this took quite a few CPU cycles to find ... */
+       session_key->data = discard_const_p(unsigned char, "SystemLibraryDTC");
+       session_key->length = 16;
+       return NT_STATUS_OK;
+}
 
 /*
-  fetch the user session key for the underlying transport. Currently
-  only works for the ncacn_np transport
+  fetch the user session key - may be default (above) or the SMB session key
 */
 NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p,
                                  DATA_BLOB *session_key)
 {
-       struct cli_tree *tree;
+       return p->security_state.session_key(p, session_key);
+}
+
+
+/*
+  log a rpc packet in a format suitable for ndrdump. This is especially useful
+  for sealed packets, where ethereal cannot easily see the contents
+
+  this triggers on a debug level of >= 10
+*/
+void dcerpc_log_packet(const struct dcerpc_interface_table *ndr,
+                      uint32_t opnum, uint32_t flags, DATA_BLOB *pkt)
+{
+       const int num_examples = 20;
+       int i;
 
-       if (p->security_state) {
-               return p->security_state->session_key(p->security_state, session_key);
-       }
-       
-       tree = dcerpc_smb_tree(p);
-       if (tree) {
-               if (tree->session->user_session_key.data) {
-                       *session_key = tree->session->user_session_key;
-                       return NT_STATUS_OK;
+       if (DEBUGLEVEL < 10) return;
+
+       for (i=0;i<num_examples;i++) {
+               char *name=NULL;
+               asprintf(&name, "%s/rpclog/%s-%u.%d.%s", 
+                        lp_lockdir(), ndr->name, opnum, i,
+                        (flags&NDR_IN)?"in":"out");
+               if (name == NULL) {
+                       return;
                }
+               if (!file_exist(name, NULL)) {
+                       if (file_save(name, pkt->data, pkt->length)) {
+                               DEBUG(10,("Logged rpc packet to %s\n", name));
+                       }
+                       free(name);
+                       break;
+               }
+               free(name);
        }
-
-       return NT_STATUS_NO_USER_SESSION_KEY;
 }
+