r5930: Fix initialisation of dcerpc_binding->authservice
[samba.git] / source4 / librpc / rpc / dcerpc_util.c
index a951f782c384b5ec32d276a1eae65cd9c3ec3929..bbbda5ee28ca36fff1a2140ee99434a832e5051c 100644 (file)
 */
 
 #include "includes.h"
-
-/*
-  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, AF_UNSPEC );
-       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, 
-                                   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.tower.num_floors = 5;
-       twr.tower.floors = talloc(p, sizeof(twr.tower.floors[0]) * 5);
-
-       /* what I'd like for christmas ... */
-
-       /* an RPC interface ... */
-       twr.tower.floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
-       GUID_from_string(uuid, &twr.tower.floors[0].lhs.info.uuid.uuid);
-       twr.tower.floors[0].lhs.info.uuid.version = version;
-       twr.tower.floors[0].rhs.uuid.unknown = 0;
-
-       /* encoded with NDR ... */
-       twr.tower.floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
-       GUID_from_string(NDR_GUID, &twr.tower.floors[1].lhs.info.uuid.uuid);
-       twr.tower.floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
-       twr.tower.floors[1].rhs.uuid.unknown = 0;
-
-       /* on an RPC connection ... */
-       twr.tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
-       twr.tower.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.tower.floors[2].rhs.ncacn.minor_version = 0;
-
-       /* on a TCP port ... */
-       twr.tower.floors[3].lhs.protocol = EPM_PROTOCOL_TCP;
-       twr.tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.tower.floors[3].rhs.tcp.port = 0;
-
-       /* on an IP link ... */
-       twr.tower.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
-       twr.tower.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
-       twr.tower.floors[4].rhs.ip.address = 0;
-
-       /* 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 != 5 ||
-           twr_r->tower.floors[3].lhs.protocol != twr.tower.floors[3].lhs.protocol) {
-               dcerpc_pipe_close(p);
-               return NT_STATUS_PORT_UNREACHABLE;
-       }
-
-       *port = twr_r->tower.floors[3].rhs.tcp.port;
-
-       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;
+       const struct dcerpc_interface_list *l;
+       for (l=librpc_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";
@@ -150,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;
+       const struct dcerpc_interface_list *l;
+       for (l=librpc_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;
@@ -166,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];
+       const struct dcerpc_interface_list *l;
+       for (l=librpc_dcerpc_pipes();l;l=l->next) {
+               if (strcasecmp(l->table->name, name) == 0) {
+                       return l->table;
                }
        }
        return NULL;
@@ -180,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];
+       const struct dcerpc_interface_list *l;
+       for (l=librpc_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
 */
@@ -210,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 {
@@ -239,14 +137,16 @@ static const struct {
        const char *name;
        enum dcerpc_transport_t transport;
        int num_protocols;
-       enum epm_protocols protseq[MAX_PROTSEQ];
+       enum epm_protocol protseq[MAX_PROTSEQ];
 } transports[] = {
        { "ncacn_np",     NCACN_NP, 3, 
-               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB, EPM_PROTOCOL_PIPE }},
+               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NETBIOS }},
        { "ncacn_ip_tcp", NCACN_IP_TCP, 3, 
-               { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_IP, EPM_PROTOCOL_TCP } }, 
+               { 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_NCACN, EPM_PROTOCOL_IP, EPM_PROTOCOL_UDP } },
+               { 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, 
@@ -261,6 +161,12 @@ static const struct {
                { 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 {
@@ -270,12 +176,88 @@ static const struct {
        {"sign", DCERPC_SIGN},
        {"seal", DCERPC_SEAL},
        {"connect", DCERPC_CONNECT},
+       {"spnego", DCERPC_AUTH_SPNEGO},
+       {"krb5", DCERPC_AUTH_KRB5},
        {"validate", DCERPC_DEBUG_VALIDATE_BOTH},
        {"print", DCERPC_DEBUG_PRINT_BOTH},
        {"padcheck", DCERPC_DEBUG_PAD_CHECK},
        {"bigendian", DCERPC_PUSH_BIGENDIAN}
 };
 
+const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *fl)
+{
+       struct GUID uuid;
+       uint16_t if_version;
+       NTSTATUS status;
+
+       switch(fl->lhs.protocol) {
+               case EPM_PROTOCOL_UUID:
+                       status = dcerpc_floor_get_lhs_data(fl, &uuid, &if_version);
+                       if (NT_STATUS_IS_OK(status)) {
+                               /* lhs is used: UUID */
+                               char *uuidstr;
+
+                               uuidstr = GUID_string(mem_ctx, &uuid);
+
+                               if (strcasecmp(uuidstr, NDR_GUID) == 0) {
+                                       return "NDR";
+                               } 
+
+                               return talloc_asprintf(mem_ctx, " uuid %s/0x%02x", uuidstr, if_version);
+                       } else { /* IPX */
+                               return talloc_asprintf(mem_ctx, "IPX:%s", 
+                                               data_blob_hex_string(mem_ctx, &fl->rhs.uuid.unknown));
+                       }
+
+               case EPM_PROTOCOL_NCACN:
+                       return "RPC-C";
+
+               case EPM_PROTOCOL_NCADG:
+                       return "RPC";
+
+               case EPM_PROTOCOL_NCALRPC:
+                       return "NCALRPC";
+
+               case EPM_PROTOCOL_DNET_NSP:
+                       return "DNET/NSP";
+
+               case EPM_PROTOCOL_IP:
+                       return talloc_asprintf(mem_ctx, "IP:%s", fl->rhs.ip.ipaddr);
+
+               case EPM_PROTOCOL_PIPE:
+                       return talloc_asprintf(mem_ctx, "PIPE:%s", fl->rhs.pipe.path);
+
+               case EPM_PROTOCOL_SMB:
+                       return talloc_asprintf(mem_ctx, "SMB:%s", fl->rhs.smb.unc);
+
+               case EPM_PROTOCOL_UNIX_DS:
+                       return talloc_asprintf(mem_ctx, "Unix:%s", fl->rhs.unix_ds.path);
+
+               case EPM_PROTOCOL_NETBIOS:
+                       return talloc_asprintf(mem_ctx, "NetBIOS:%s", fl->rhs.netbios.name);
+
+               case EPM_PROTOCOL_NETBEUI:
+                       return "NETBeui";
+
+               case EPM_PROTOCOL_SPX:
+                       return "SPX";
+
+               case EPM_PROTOCOL_NB_IPX:
+                       return "NB_IPX";
+
+               case EPM_PROTOCOL_HTTP:
+                       return talloc_asprintf(mem_ctx, "HTTP:%d", fl->rhs.http.port);
+
+               case EPM_PROTOCOL_TCP:
+                       return talloc_asprintf(mem_ctx, "TCP:%d", fl->rhs.tcp.port);
+
+               case EPM_PROTOCOL_UDP:
+                       return talloc_asprintf(mem_ctx, "UDP:%d", fl->rhs.udp.port);
+
+               default:
+                       return talloc_asprintf(mem_ctx, "UNK(%02x):", fl->lhs.protocol);
+       }
+}
 
 
 /*
@@ -283,7 +265,7 @@ static const struct {
 */
 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;
 
@@ -296,8 +278,9 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
                return NULL;
        }
 
-       if (!uuid_all_zero(&b->object)) { 
-               s = talloc_asprintf(mem_ctx, "%s@", GUID_string(mem_ctx, &b->object));
+       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);
@@ -307,27 +290,31 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
                s = talloc_asprintf_append(s, "%s", b->host);
        }
 
-       if ((!b->options || !b->options[0]) && !b->flags) {
+       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_append(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_append(s, "%s,", ncacn_options[i].name);
+                       s = talloc_asprintf_append(s, ",%s", ncacn_options[i].name);
                        if (!s) return NULL;
                }
        }
 
-       s[strlen(s)-1] = 0;
        s = talloc_asprintf_append(s, "]");
 
        return s;
@@ -336,12 +323,20 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
 /*
   parse a binding string into a dcerpc_binding structure
 */
-NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding *b)
+NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out)
 {
+       struct dcerpc_binding *b;
        char *options, *type;
        char *p;
        int i, j, comma_count;
 
+       b = talloc(mem_ctx, struct dcerpc_binding);
+       if (!b) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       b->authservice = NULL;
+
        p = strchr(s, '@');
 
        if (p && PTR_DIFF(p, s) == 36) { /* 36 is the length of a UUID */
@@ -359,6 +354,8 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_
                ZERO_STRUCT(b->object);
        }
 
+       b->object_version = 0;
+
        p = strchr(s, ':');
        if (!p) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -384,14 +381,14 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_
 
        p = strchr(s, '[');
        if (p) {
-               b->host = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
+               b->host = talloc_strndup(b, 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);
+               b->host = talloc_strdup(b, s);
                options = NULL;
        }
 
@@ -401,19 +398,22 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_
 
        b->options = NULL;
        b->flags = 0;
+       b->endpoint = NULL;
 
        if (!options) {
+               *b_out = b;
                return NT_STATUS_OK;
        }
 
        comma_count = count_chars(options, ',');
-       b->options = talloc_array_p(mem_ctx, const char *, comma_count+2);
+
+       b->options = talloc_array(b, const char *, comma_count+2);
        if (!b->options) {
                return NT_STATUS_NO_MEMORY;
        }
 
        for (i=0; (p = strchr(options, ',')); i++) {
-               b->options[i] = talloc_strndup(mem_ctx, options, PTR_DIFF(p, options));
+               b->options[i] = talloc_strndup(b, options, PTR_DIFF(p, options));
                if (!b->options[i]) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -436,11 +436,58 @@ 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;
        
+       *b_out = b;
        return NT_STATUS_OK;
 }
 
-static const char *floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor)
+NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *floor, struct GUID *uuid, uint16_t *if_version)
+{
+       TALLOC_CTX *mem_ctx = talloc_init("floor_get_lhs_data");
+       struct ndr_pull *ndr = ndr_pull_init_blob(&floor->lhs.lhs_data, mem_ctx);
+       NTSTATUS status;
+       
+       ndr->flags |= LIBNDR_FLAG_NOALIGN;
+
+       status = ndr_pull_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, uuid);
+       if (NT_STATUS_IS_ERR(status)) {
+               talloc_free(mem_ctx);
+               return status;
+       }
+
+       status = ndr_pull_uint16(ndr, NDR_SCALARS, if_version);
+
+       talloc_free(mem_ctx);
+
+       return status;
+}
+
+DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, struct GUID *uuid, uint32_t if_version)
+{
+       struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx);
+
+       ndr->flags |= LIBNDR_FLAG_NOALIGN;
+
+       ndr_push_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, uuid);
+       ndr_push_uint16(ndr, NDR_SCALARS, if_version);
+
+       return ndr_push_blob(ndr);
+}
+
+const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor)
 {
        switch (floor->lhs.protocol) {
        case EPM_PROTOCOL_TCP:
@@ -456,15 +503,7 @@ static const char *floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
                return talloc_asprintf(mem_ctx, "%d", floor->rhs.http.port);
 
        case EPM_PROTOCOL_IP:
-               if (floor->rhs.ip.address == 0) {
-                       return NULL; 
-               }
-
-               {
-               struct in_addr in;
-                       in.s_addr = htonl(floor->rhs.ip.address);
-            return talloc_strdup(mem_ctx, inet_ntoa(in));
-               }
+               return talloc_strdup(mem_ctx, floor->rhs.ip.ipaddr);
 
        case EPM_PROTOCOL_NCACN:
                return NULL;
@@ -473,12 +512,15 @@ static const char *floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
                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:
@@ -494,16 +536,21 @@ static const char *floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
                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 floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor,  const char *data)
+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:
@@ -519,26 +566,8 @@ static NTSTATUS floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor,
                return NT_STATUS_OK;
 
        case EPM_PROTOCOL_IP:
-               floor->rhs.ip.address = 0;
-
-               /* Only try to put in a IPv4 address. Windows 2003 just returns 
-                * 0.0.0.0 for IPv6 addresses */
-               if (strlen(data) > 0) {
-                   struct addrinfo hints, *res;
-
-                       memset(&hints, 0, sizeof(struct addrinfo));
-
-                       hints.ai_family = AF_INET;
-                       hints.ai_protocol = PF_INET;
-
-                       if (getaddrinfo(data, NULL, &hints, &res) < 0) {
-                               return NT_STATUS_BAD_NETWORK_NAME;
-                       }
-
-                       floor->rhs.ip.address = ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr);
-
-                       freeaddrinfo(res);
-               }
+               floor->rhs.ip.ipaddr = talloc_strdup(mem_ctx, data);
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.ip.ipaddr);
                return NT_STATUS_OK;
 
        case EPM_PROTOCOL_NCACN:
@@ -551,23 +580,17 @@ static NTSTATUS floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor,
 
        case EPM_PROTOCOL_SMB:
                floor->rhs.smb.unc = talloc_strdup(mem_ctx, data);
-               if (!floor->rhs.smb.unc) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.smb.unc);
                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;
-               }
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.pipe.path);
                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;
-               }
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.netbios.name);
                return NT_STATUS_OK;
 
        case EPM_PROTOCOL_NCALRPC:
@@ -583,34 +606,44 @@ static NTSTATUS floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *floor,
                
        case EPM_PROTOCOL_STREETTALK:
                floor->rhs.streettalk.streettalk = talloc_strdup(mem_ctx, data);
-               if (!floor->rhs.streettalk.streettalk) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.streettalk.streettalk);
                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;
-               }
+               NT_STATUS_HAVE_NO_MEMORY(floor->rhs.unix_ds.path);
                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;
 }
 
-NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower, struct dcerpc_binding *binding)
+enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot)
 {
        int i;
 
-       binding->transport = -1;
-       ZERO_STRUCT(binding->object);
-       binding->options = NULL;
-       binding->host = NULL;
-       binding->flags = 0;
+       /* 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++) {
@@ -618,7 +651,7 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower,
                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;
@@ -626,10 +659,28 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower,
                }
 
                if (j == transports[i].num_protocols) {
-                       binding->transport = transports[i].transport;
-                       break;
+                       return transports[i].transport;
                }
        }
+       
+       /* Unknown transport */
+       return -1;
+}
+
+NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower, struct dcerpc_binding **b_out)
+{
+       NTSTATUS status;
+       struct dcerpc_binding *binding;
+
+       binding = talloc(mem_ctx, struct dcerpc_binding);
+       NT_STATUS_HAVE_NO_MEMORY(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;
@@ -640,39 +691,39 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower,
        }
 
        /* Set object uuid */
-       binding->object = tower->floors[0].lhs.info.uuid.uuid;
+       status = dcerpc_floor_get_lhs_data(&tower->floors[0], &binding->object, &binding->object_version);
+       
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Error pulling object uuid and version: %s", nt_errstr(status)));     
+               return status;
+       }
 
        /* Ignore floor 1, it contains the NDR version info */
        
-       binding->options = talloc_array_p(mem_ctx, const char *, 2);
+       binding->options = NULL;
 
        /* Set endpoint */
-       if (tower->num_floors >= 3) {
-               binding->options[0] = floor_get_rhs_data(mem_ctx, &tower->floors[tower->num_floors-1]);
+       if (tower->num_floors >= 4) {
+               binding->endpoint = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[3]);
        } else {
-               binding->options[0] = NULL;
+               binding->endpoint = NULL;
        }
-       binding->options[1] = NULL;
 
        /* Set network address */
-       if (tower->num_floors >= 4) {
-               binding->host = floor_get_rhs_data(mem_ctx, &tower->floors[tower->num_floors-2]);
+       if (tower->num_floors >= 5) {
+               binding->host = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[4]);
        }
+       *b_out = binding;
        return NT_STATUS_OK;
 }
 
-NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding, struct epm_tower **tower)
+NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding, struct epm_tower *tower)
 {
-       const enum epm_protocols *protseq;
+       const enum epm_protocol *protseq = NULL;
        int num_protocols = -1, i;
+       struct GUID ndr_guid;
        NTSTATUS status;
        
-       *tower = talloc_p(mem_ctx, struct epm_tower);
-
-       if (!(*tower)) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
        /* Find transport */
        for (i=0;i<ARRAY_SIZE(transports);i++) {
                if (transports[i].transport == binding->transport) {
@@ -687,39 +738,47 @@ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       (*tower)->num_floors = 2 + num_protocols;
-       (*tower)->floors = talloc_array_p(mem_ctx, struct epm_floor, (*tower)->num_floors);
+       tower->num_floors = 2 + num_protocols;
+       tower->floors = talloc_array(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 = 0;
+       tower->floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
+
+       tower->floors[0].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, &binding->object, binding->object_version);
+
+       tower->floors[0].rhs.uuid.unknown = data_blob_talloc_zero(mem_ctx, 2);
        
        /* Floor 1 */
-       (*tower)->floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
-       (*tower)->floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
-       status = GUID_from_string(NDR_GUID, &(*tower)->floors[1].lhs.info.uuid.uuid);
+       tower->floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
+
+       status = GUID_from_string(NDR_GUID, &ndr_guid);
        if (NT_STATUS_IS_ERR(status)) {
                return status;
        }
 
+       tower->floors[1].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, &ndr_guid, NDR_GUID_VERSION);
+       
+       tower->floors[1].rhs.uuid.unknown = data_blob_talloc_zero(mem_ctx, 2);
+       
        /* Floor 2 to num_protocols */
        for (i = 0; i < num_protocols; i++) {
-               (*tower)->floors[2 + i].lhs.protocol = protseq[i];
-               ZERO_STRUCT((*tower)->floors[2 + i].rhs);
+               tower->floors[2 + i].lhs.protocol = protseq[i];
+               tower->floors[2 + i].lhs.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 top floor contains the endpoint */
-       if (num_protocols >= 1 && binding->options && binding->options[0]) {
-               status = floor_set_rhs_data(mem_ctx, &(*tower)->floors[2 + num_protocols - 1], binding->options[0]);
+       /* 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 second-to-top floor contains the network address */
-       if (num_protocols >= 2 && binding->host) {
-               status = floor_set_rhs_data(mem_ctx, &(*tower)->floors[2 + num_protocols - 2], binding->host);
+       
+       /* 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;
                }
@@ -728,173 +787,358 @@ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *
        return NT_STATUS_OK;
 }
 
-
-/* open a rpc connection to a rpc pipe on SMB using the binding
-   structure to determine the endpoint and options */
-static NTSTATUS dcerpc_pipe_connect_ncacn_np(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 dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
+                               const char *uuid, uint_t version)
 {
+       struct dcerpc_pipe *p;
        NTSTATUS status;
-       BOOL retry;
-       struct smbcli_state *cli;
-       const char *pipe_name;
-       TALLOC_CTX *mem_ctx = talloc_init("dcerpc_pipe_connect_ncacn_np");
-       
-       if (!binding->options || !binding->options[0] || !strlen(binding->options[0])) {
-               const struct dcerpc_interface_table *table = idl_iface_by_uuid(pipe_uuid);
-               struct dcerpc_binding default_binding;
-               int i;
-
-               if (!table) {
-                       DEBUG(0,("Unknown interface endpoint '%s'\n", pipe_uuid));
-                       talloc_destroy(mem_ctx);
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
+       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);
+       struct cli_credentials *credentials;
+       int i;
+
+       /* First, check if there is a default endpoint specified in the IDL */
+
+       if (table) {
+               struct dcerpc_binding *default_binding;
+
+               binding->authservice = talloc_strdup(binding, table->authservices->names[0]);
 
                /* 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 == NCACN_NP) {
-                               pipe_name = default_binding.options[0]; 
-                               break;
-                               
+                       if (NT_STATUS_IS_OK(status)) {
+                               if (default_binding->transport == binding->transport && default_binding->endpoint) {
+                                       binding->endpoint = talloc_reference(binding, default_binding->endpoint);
+                                       talloc_free(default_binding);
+                                       return NT_STATUS_OK;
+                               } else {
+                                       talloc_free(default_binding);
+                               }
                        }
                }
+       }
+
+       epmapper_binding = talloc_zero(mem_ctx, struct dcerpc_binding);
+       if (!epmapper_binding) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       epmapper_binding->transport = binding->transport;
+       epmapper_binding->host = talloc_reference(epmapper_binding, 
+                                                 binding->host);
+       epmapper_binding->options = NULL;
+       epmapper_binding->flags = 0;
+       epmapper_binding->endpoint = NULL;
+       epmapper_binding->authservice = NULL;
+       
+       credentials = talloc_zero(mem_ctx, struct cli_credentials);
+       cli_credentials_guess(credentials);
+       status = dcerpc_pipe_connect_b(&p,
+                                      epmapper_binding,
+                                      DCERPC_EPMAPPER_UUID,
+                                      DCERPC_EPMAPPER_VERSION,
+                                      credentials);
+
+       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 = talloc_reference(binding, dcerpc_floor_get_rhs_data(mem_ctx, &twr_r->tower.floors[3]));
+
+       dcerpc_pipe_close(p);
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+   perform an authenticated bind if needed
+*/
+NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p, 
+                         struct dcerpc_binding *binding,
+                         const char *pipe_uuid, 
+                         uint32_t pipe_version,
+                         struct cli_credentials *credentials)
+{
+       NTSTATUS status;
+       p->conn->flags = binding->flags;
+
+       /* remember the binding string for possible secondary connections */
+       p->conn->binding_string = dcerpc_binding_string(p, binding);
+
+       if (!cli_credentials_is_anonymous(credentials) &&
+               (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = dcerpc_bind_auth_schannel(p, pipe_uuid, pipe_version, 
+                                                  credentials);
+       } else if (!cli_credentials_is_anonymous(credentials)) {
+               uint8_t auth_type;
+               if (binding->flags & DCERPC_AUTH_SPNEGO) {
+                       auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+               } else if (binding->flags & DCERPC_AUTH_KRB5) {
+                       auth_type = DCERPC_AUTH_TYPE_KRB5;
+               } else {
+                       auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+               }
+
+               status = dcerpc_bind_auth_password(p, pipe_uuid, pipe_version, 
+                                                                                  credentials, auth_type,
+                                                                                  binding->authservice);
        } else {
-               pipe_name = binding->options[0];
+               status = dcerpc_bind_auth_none(p, pipe_uuid, pipe_version);
        }
 
-       if (!strncasecmp(pipe_name, "/pipe/", 6) || 
-               !strncasecmp(pipe_name, "\\pipe\\", 6)) {
-               pipe_name+=6;
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to bind to uuid %s - %s\n", pipe_uuid, nt_errstr(status)));
        }
+       return status;
+}
+
 
-       if (pipe_name[0] != '\\') {
-               pipe_name = talloc_asprintf(mem_ctx, "\\%s", pipe_name);
+/* open a rpc connection to a rpc pipe on SMB using the binding
+   structure to determine the endpoint and options */
+static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **pp, 
+                                            struct dcerpc_binding *binding,
+                                            const char *pipe_uuid, 
+                                            uint32_t pipe_version,
+                                                struct cli_credentials *credentials)
+{
+       struct dcerpc_pipe *p;
+       NTSTATUS status;
+       struct smbcli_state *cli;
+       const char *pipe_name = NULL;
+       TALLOC_CTX *tmp_ctx;
+
+       *pp = NULL;
+
+       p = dcerpc_pipe_init(NULL);
+       if (p == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       tmp_ctx = talloc_new(p);
        
-       if (!username || !username[0]) {
-               status = smbcli_full_connection(NULL, &cli, lp_netbios_name(),
-                                            binding->host, NULL, 
-                                            "ipc$", "?????", 
-                                            "", "", NULL, 0, &retry);
+       /* Look up identifier using the epmapper */
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(tmp_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_free(p);
+                       return status;
+               }
+               DEBUG(1,("Mapped to DCERPC/NP pipe %s\n", binding->endpoint));
+       }
+
+       pipe_name = binding->endpoint;
+
+       if (cli_credentials_is_anonymous(credentials) || 
+           (binding->flags & DCERPC_SCHANNEL_ANY)) {
+               status = smbcli_full_connection(p->conn, &cli, 
+                                               cli_credentials_get_workstation(credentials),
+                                               binding->host, 
+                                               "ipc$", NULL, 
+                                               NULL);
        } else {
-               status = smbcli_full_connection(NULL, &cli, lp_netbios_name(),
-                                            binding->host, NULL, 
-                                            "ipc$", "?????"
-                                            username, domain,
-                                            password, 0, &retry);
+               status = smbcli_full_connection(p->conn, &cli, 
+                                               cli_credentials_get_workstation(credentials),
+                                               binding->host
+                                               "ipc$", NULL,
+                                               credentials);
        }
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to connect to %s - %s\n", binding->host, nt_errstr(status)));
-               talloc_destroy(mem_ctx);
+               talloc_free(p);
                return status;
        }
 
-       status = dcerpc_pipe_open_smb(p, cli->tree, pipe_name);
+       status = dcerpc_pipe_open_smb(p->conn, cli->tree, pipe_name);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to open pipe %s - %s\n", pipe_name, nt_errstr(status)));
-               smbcli_tdis(cli);
-               smbcli_shutdown(cli);
-               talloc_destroy(mem_ctx);
-        return status;
-    }  
+               talloc_free(p);
+               return status;
+       }
 
-       talloc_destroy(mem_ctx);
-       
-       /* this ensures that the reference count is decremented so
-          a pipe close will really close the link */
-       talloc_steal(*p, cli);
+       (*pp) = p;
+       talloc_free(tmp_ctx);
 
-       (*p)->flags = binding->flags;
+       return NT_STATUS_OK;
+}
 
-       /* remember the binding string for possible secondary connections */
-       (*p)->binding_string = dcerpc_binding_string((*p), binding);
+/* 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 **pp, 
+                                           struct dcerpc_binding *binding,
+                                           const char *pipe_uuid, 
+                                           uint32_t pipe_version)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p;
+       TALLOC_CTX *tmp_ctx;
 
-       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] &&
-                  (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);
+       (*pp) = NULL;
+
+       p = dcerpc_pipe_init(NULL);
+       if (p == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tmp_ctx = talloc_new(p);
 
+       /* Look up identifier using the epmapper */
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(tmp_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_free(p);
+                       return status;
+               }
+               DEBUG(1,("Mapped to DCERPC/LRPC identifier %s\n", binding->endpoint));
        }
 
+       status = dcerpc_pipe_open_pipe(p->conn, binding->endpoint);
        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;
+               DEBUG(0,("Failed to open ncalrpc pipe '%s' - %s\n", 
+                        binding->endpoint, nt_errstr(status)));
+               talloc_free(p);
+               return status;
        }
 
-       return NT_STATUS_OK;
+       (*pp) = p;
+       talloc_free(tmp_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_unix_stream(struct dcerpc_pipe **pp, 
+                                                     struct dcerpc_binding *binding,
+                                                     const char *pipe_uuid, 
+                                                     uint32_t pipe_version)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p;
+
+       (*pp) = NULL;
+
+       if (!binding->endpoint) {
+               DEBUG(0, ("Path to unix socket not specified\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       p = dcerpc_pipe_init(NULL);
+       if (p == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = dcerpc_pipe_open_unix_stream(p->conn, binding->endpoint);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to open unix socket %s - %s\n", 
+                        binding->endpoint, nt_errstr(status)));
+               talloc_free(p);
+                return status;
+       }
+
+       (*pp) = p;
+       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_ip_tcp(struct dcerpc_pipe **pp
                                                 struct dcerpc_binding *binding,
                                                 const char *pipe_uuid, 
-                                                uint32_t pipe_version,
-                                                const char *domain,
-                                                const char *username,
-                                                const char *password)
+                                                uint32_t pipe_version)
 {
        NTSTATUS status;
        uint32_t port = 0;
+       struct dcerpc_pipe *p;
+       TALLOC_CTX *tmp_ctx;
+
+       (*pp) = NULL;
 
-       if (binding->options && binding->options[0] && strlen(binding->options[0])) {
-               port = atoi(binding->options[0]);
+       p = dcerpc_pipe_init(NULL);
+       if (p == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       tmp_ctx = talloc_new(p);
 
-       if (port == 0) {
-               status = dcerpc_epm_map_tcp_port(binding->host, 
-                                                pipe_uuid, pipe_version,
-                                                &port);
+       if (!binding->endpoint) {
+               status = dcerpc_epm_map_binding(tmp_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)));
+                       talloc_free(p);
                        return status;
                }
-               DEBUG(1,("Mapped to DCERPC/TCP port %u\n", port));
+               DEBUG(1,("Mapped to DCERPC/TCP port %s\n", binding->endpoint));
        }
 
-       status = dcerpc_pipe_open_tcp(p, binding->host, port, AF_UNSPEC);
+       port = atoi(binding->endpoint);
+
+       status = dcerpc_pipe_open_tcp(p->conn, 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)));
+               talloc_free(p);
                 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;
-       }
+       (*pp) = p;
+       talloc_free(tmp_ctx);
  
         return status;
 }
@@ -902,62 +1146,76 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
 
 /* open a rpc connection to a rpc pipe, using the specified 
    binding structure to determine the endpoint and options */
-NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p, 
+NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **pp
                               struct dcerpc_binding *binding,
                               const char *pipe_uuid, 
                               uint32_t pipe_version,
-                              const char *domain,
-                              const char *username,
-                              const char *password)
+                                  struct cli_credentials *credentials)
 {
        NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
-
+       
        switch (binding->transport) {
        case NCACN_NP:
-               status = dcerpc_pipe_connect_ncacn_np(p, binding, pipe_uuid, pipe_version,
-                                                     domain, username, password);
+               status = dcerpc_pipe_connect_ncacn_np(pp, binding, pipe_uuid, pipe_version, credentials);
                break;
        case NCACN_IP_TCP:
-               status = dcerpc_pipe_connect_ncacn_ip_tcp(p, binding, pipe_uuid, pipe_version,
-                                                         domain, username, password);
+               status = dcerpc_pipe_connect_ncacn_ip_tcp(pp, binding, pipe_uuid, pipe_version);
+               break;
+       case NCACN_UNIX_STREAM:
+               status = dcerpc_pipe_connect_ncacn_unix_stream(pp, binding, pipe_uuid, pipe_version);
+               break;
+       case NCALRPC:
+               status = dcerpc_pipe_connect_ncalrpc(pp, binding, pipe_uuid, pipe_version);
                break;
        default:
                return NT_STATUS_NOT_SUPPORTED;
        }
 
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = dcerpc_pipe_auth(*pp, binding, pipe_uuid, pipe_version, credentials);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(*pp);
+               *pp = NULL;
+               return status;
+       }
+
        return status;
 }
 
 
 /* open a rpc connection to a rpc pipe, using the specified string
    binding to determine the endpoint and options */
-NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p, 
+NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **pp
                             const char *binding,
                             const char *pipe_uuid, 
                             uint32_t pipe_version,
-                            const char *domain,
-                            const char *username,
-                            const char *password)
+                                struct cli_credentials *credentials)
 {
-       struct dcerpc_binding b;
+       struct dcerpc_binding *b;
        NTSTATUS status;
-       TALLOC_CTX *mem_ctx;
+       TALLOC_CTX *tmp_ctx;
 
-       mem_ctx = talloc_init("dcerpc_pipe_connect");
-       if (!mem_ctx) return NT_STATUS_NO_MEMORY;
+       tmp_ctx = talloc_new(NULL);
+       if (!tmp_ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       status = dcerpc_parse_binding(mem_ctx, binding, &b);
+       status = dcerpc_parse_binding(tmp_ctx, binding, &b);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to parse dcerpc binding '%s'\n", binding));
-               talloc_destroy(mem_ctx);
+               talloc_free(tmp_ctx);
                return status;
        }
 
-       DEBUG(3,("Using binding %s\n", dcerpc_binding_string(mem_ctx, &b)));
+       DEBUG(3,("Using binding %s\n", dcerpc_binding_string(tmp_ctx, b)));
+
+       status = dcerpc_pipe_connect_b(pp, b, pipe_uuid, pipe_version, credentials);
 
-       status = dcerpc_pipe_connect_b(p, &b, pipe_uuid, pipe_version, domain, username, password);
+       talloc_free(tmp_ctx);
 
-       talloc_destroy(mem_ctx);
        return status;
 }
 
@@ -969,53 +1227,50 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p,
   will be on the same SMB connection, but use a new fnum
 */
 NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe **p2,
-                                    const char *pipe_name,
-                                    const char *pipe_uuid,
-                                    uint32_t pipe_version)
+                                    struct dcerpc_binding *b)
+
+
 {
        struct smbcli_tree *tree;
        NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
-       struct dcerpc_binding b;
 
-       switch (p->transport.transport) {
+       (*p2) = dcerpc_pipe_init(p);
+       if (*p2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       switch (p->conn->transport.transport) {
        case NCACN_NP:
-               tree = dcerpc_smb_tree(p);
+               tree = dcerpc_smb_tree(p->conn);
                if (!tree) {
                        return NT_STATUS_INVALID_PARAMETER;
                }
-
-               status = dcerpc_pipe_open_smb(p2, tree, pipe_name);
+               status = dcerpc_pipe_open_smb((*p2)->conn, tree, b->endpoint);
                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_connect_ncacn_ip_tcp(p2, &b, pipe_uuid,
-                                                         pipe_version, NULL, 
-                                                         NULL, NULL);
+               status = dcerpc_pipe_open_tcp((*p2)->conn, b->host, atoi(b->endpoint));
                break;
+
+       case NCALRPC:
+               status = dcerpc_pipe_open_pipe((*p2)->conn, b->endpoint);
+               break;
+
        default:
                return NT_STATUS_NOT_SUPPORTED;
        }
 
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(*p2);
                return status;
        }
 
-       (*p2)->flags = p->flags;
-
-       status = dcerpc_bind_auth_none(*p2, pipe_uuid, pipe_version);
-       if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
+       (*p2)->conn->flags = p->conn->flags;
 
        return NT_STATUS_OK;
 }
 
-NTSTATUS dcerpc_generic_session_key(struct dcerpc_pipe *p,
+NTSTATUS dcerpc_generic_session_key(struct dcerpc_connection *c,
                                    DATA_BLOB *session_key)
 {
        /* this took quite a few CPU cycles to find ... */
@@ -1030,7 +1285,7 @@ NTSTATUS dcerpc_generic_session_key(struct dcerpc_pipe *p,
 NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p,
                                  DATA_BLOB *session_key)
 {
-       return p->security_state.session_key(p, session_key);
+       return p->conn->security_state.session_key(p->conn, session_key);
 }
 
 
@@ -1056,7 +1311,7 @@ void dcerpc_log_packet(const struct dcerpc_interface_table *ndr,
                if (name == NULL) {
                        return;
                }
-               if (!file_exist(name, NULL)) {
+               if (!file_exist(name)) {
                        if (file_save(name, pkt->data, pkt->length)) {
                                DEBUG(10,("Logged rpc packet to %s\n", name));
                        }
@@ -1067,3 +1322,50 @@ void dcerpc_log_packet(const struct dcerpc_interface_table *ndr,
        }
 }
 
+
+
+/*
+  create a secondary context from a primary connection
+
+  this uses dcerpc_alter_context() to create a new dcerpc context_id
+*/
+NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, 
+                                 struct dcerpc_pipe **pp2,
+                                 const char *pipe_uuid,
+                                 uint32_t pipe_version)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p2;
+       
+       p2 = talloc_zero(p, struct dcerpc_pipe);
+       if (p2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       p2->conn = talloc_reference(p2, p->conn);
+
+       p2->context_id = ++p->conn->next_context_id;
+
+       status = GUID_from_string(pipe_uuid, &p2->syntax.uuid);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(p2);
+               return status;
+       }
+       p2->syntax.if_version = pipe_version;
+
+       status = GUID_from_string(NDR_GUID, &p2->transfer_syntax.uuid);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(p2);
+               return status;
+       }
+       p2->transfer_syntax.if_version = NDR_GUID_VERSION;
+
+       status = dcerpc_alter_context(p2, p2, &p2->syntax, &p2->transfer_syntax);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(p2);
+               return status;
+       }
+
+       *pp2 = p2;
+
+       return status;
+}