r4627: - simplified the dcerpc auth code using a common function
[samba.git] / source4 / librpc / rpc / dcerpc_util.c
index c484a2618c12b32007667d1b85b85aa73632c00b..534c17678d9e22f9500903044e1cb8455b58830f 100644 (file)
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/network.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 
 /*
 */
 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";
@@ -44,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;
@@ -60,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;
@@ -74,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
 */
@@ -104,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 {
@@ -133,7 +137,7 @@ 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_NETBIOS }},
@@ -172,6 +176,7 @@ static const struct {
        {"sign", DCERPC_SIGN},
        {"seal", DCERPC_SEAL},
        {"connect", DCERPC_CONNECT},
+       {"spnego", DCERPC_AUTH_SPNEGO},
        {"validate", DCERPC_DEBUG_VALIDATE_BOTH},
        {"print", DCERPC_DEBUG_PRINT_BOTH},
        {"padcheck", DCERPC_DEBUG_PAD_CHECK},
@@ -185,7 +190,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;
 
@@ -198,8 +203,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);
@@ -384,9 +390,9 @@ const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
                }
 
                {
-               struct in_addr in;
-                       in.s_addr = htonl(floor->rhs.ip.address);
-            return talloc_strdup(mem_ctx, inet_ntoa(in));
+                       struct ipv4_addr in;
+                       in.addr = htonl(floor->rhs.ip.address);
+                       return talloc_strdup(mem_ctx, sys_inet_ntoa(in));
                }
 
        case EPM_PROTOCOL_NCACN:
@@ -425,6 +431,10 @@ const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
                
        case EPM_PROTOCOL_NULL:
                return NULL;
+
+       default:
+               DEBUG(0,("Unsupported lhs protocol %d\n", floor->lhs.protocol));
+               break;
        }
 
        return NULL;
@@ -509,11 +519,31 @@ static NTSTATUS dcerpc_floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor
                
        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;
@@ -581,7 +611,7 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 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;
        NTSTATUS status;
        
@@ -654,16 +684,25 @@ NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *bind
        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 (!strcmp(uuid, DCERPC_EPMAPPER_UUID)) {
-               switch(binding->transport) {
-                       case NCACN_IP_TCP: binding->endpoint = talloc_asprintf(mem_ctx, "%d", EPMAPPER_PORT); return NT_STATUS_OK;
-                       case NCALRPC: binding->endpoint = EPMAPPER_IDENTIFIER; return NT_STATUS_OK;
-                       default: return NT_STATUS_NOT_SUPPORTED;
+                       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;
@@ -734,9 +773,45 @@ NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *bind
 }
 
 
+/* 
+   perform an authenticated bind if needed
+*/
+static NTSTATUS dcerpc_pipe_auth(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;
+
+       p->conn->flags = binding->flags;
+
+       /* remember the binding string for possible secondary connections */
+       p->conn->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] && (binding->flags & DCERPC_AUTH_SPNEGO)) {
+               status = dcerpc_bind_auth_spnego(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)));
+       }
+       return status;
+}
+
+
 /* 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, 
+static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **pp
                                             struct dcerpc_binding *binding,
                                             const char *pipe_uuid, 
                                             uint32_t pipe_version,
@@ -744,220 +819,185 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
                                             const char *username,
                                             const char *password)
 {
+       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->endpoint) {
-               const struct dcerpc_interface_table *table = idl_iface_by_uuid(pipe_uuid);
-               struct dcerpc_binding default_binding;
-               int i;
+       const char *pipe_name = NULL;
+       TALLOC_CTX *tmp_ctx;
 
-               if (!table) {
-                       DEBUG(0,("Unknown interface endpoint '%s'\n", pipe_uuid));
-                       talloc_destroy(mem_ctx);
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-
-               /* 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);
+       *pp = NULL;
 
-                       if (NT_STATUS_IS_OK(status) && default_binding.transport == NCACN_NP) {
-                               pipe_name = default_binding.endpoint;   
-                               break;
-                               
-                       }
+       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 NCACN_NP pipe for '%s' - %s\n", 
+                                pipe_uuid, nt_errstr(status)));
+                       talloc_free(p);
+                       return status;
                }
-       } else {
-               pipe_name = binding->endpoint;
+               DEBUG(1,("Mapped to DCERPC/NP pipe %s\n", binding->endpoint));
        }
 
+       pipe_name = binding->endpoint;
+
        if (!strncasecmp(pipe_name, "/pipe/", 6) || 
-               !strncasecmp(pipe_name, "\\pipe\\", 6)) {
-               pipe_name+=6;
+           !strncasecmp(pipe_name, "\\pipe\\", 6)) {
+               pipe_name += 6;
        }
 
        if (pipe_name[0] != '\\') {
-               pipe_name = talloc_asprintf(mem_ctx, "\\%s", pipe_name);
+               pipe_name = talloc_asprintf(tmp_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);
+               status = smbcli_full_connection(p->conn, &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 = smbcli_full_connection(p->conn, &cli, lp_netbios_name(),
+                                               binding->host, NULL, 
+                                               "ipc$", "?????", 
+                                               username, 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);
+               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_destroy(mem_ctx);
-       
-       /* this ensures that the reference count is decremented so
-          a pipe close will really close the link */
-       talloc_steal(*p, cli);
-
-       (*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] &&
-                  (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);
-
+               talloc_free(p);
+               return status;
        }
-
+       
+       status = dcerpc_pipe_auth(p, binding, 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)));
-               dcerpc_pipe_close(*p);
-               *p = NULL;
+               talloc_free(p);
                return status;
        }
 
+       (*pp) = p;
+       talloc_free(tmp_ctx);
+
        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)
+static NTSTATUS dcerpc_pipe_connect_ncalrpc(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)
 {
        NTSTATUS status;
-       TALLOC_CTX *mem_ctx = talloc_init("dcerpc_pipe_connect_ncalrpc");
+       struct dcerpc_pipe *p;
+       TALLOC_CTX *tmp_ctx;
+
+       (*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(mem_ctx, binding, pipe_uuid, pipe_version);
+               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_destroy(mem_ctx);
+                       talloc_free(p);
                        return status;
                }
-               DEBUG(1,("Mapped to DCERPC/TCP identifier %s\n", binding->endpoint));
+               DEBUG(1,("Mapped to DCERPC/LRPC identifier %s\n", binding->endpoint));
        }
 
-       status = dcerpc_pipe_open_pipe(p, binding->endpoint);
-
+       status = dcerpc_pipe_open_pipe(p->conn, 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);
+               DEBUG(0,("Failed to open ncalrpc pipe '%s' - %s\n", 
+                        binding->endpoint, 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);
        }
 
+       status = dcerpc_pipe_auth(p, binding, 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)));
-               dcerpc_pipe_close(*p);
-               *p = NULL;
-               talloc_destroy(mem_ctx);
+               talloc_free(p);
                return status;
        }
-       talloc_destroy(mem_ctx);
-    return status;
+
+       (*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 **p, 
-                                                struct dcerpc_binding *binding,
-                                                const char *pipe_uuid, 
-                                                uint32_t pipe_version,
-                                                const char *domain,
-                                                const char *username,
-                                                const char *password)
+static NTSTATUS dcerpc_pipe_connect_ncacn_unix_stream(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)
 {
        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;
        }
 
-       status = dcerpc_pipe_open_unix_stream(p, binding->endpoint);
+       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;
        }
 
-       (*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);
-       }
-
+       status = dcerpc_pipe_auth(p, binding, 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)));
-               dcerpc_pipe_close(*p);
-               *p = NULL;
+               talloc_free(p);
                return status;
        }
+
+       (*pp) = p;
  
-    return status;
+       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,
@@ -967,14 +1007,24 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
 {
        NTSTATUS status;
        uint32_t port = 0;
-       TALLOC_CTX *mem_ctx = talloc_init("connect_ncacn_ip_tcp");
+       struct dcerpc_pipe *p;
+       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 (!binding->endpoint) {
-               status = dcerpc_epm_map_binding(mem_ctx, binding, 
-                                                pipe_uuid, pipe_version);
+               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 %s\n", binding->endpoint));
@@ -982,33 +1032,22 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
 
        port = atoi(binding->endpoint);
 
-       status = dcerpc_pipe_open_tcp(p, binding->host, port);
+       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);
-       }
-
+       status = dcerpc_pipe_auth(p, binding, 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)));
-               dcerpc_pipe_close(*p);
-               *p = NULL;
+               talloc_free(p);
                return status;
        }
+
+       (*pp) = p;
+       talloc_free(tmp_ctx);
  
         return status;
 }
@@ -1016,7 +1055,7 @@ 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,
@@ -1028,18 +1067,20 @@ NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p,
 
        switch (binding->transport) {
        case NCACN_NP:
-               status = dcerpc_pipe_connect_ncacn_np(p, binding, pipe_uuid, pipe_version,
+               status = dcerpc_pipe_connect_ncacn_np(pp, binding, pipe_uuid, pipe_version,
                                                      domain, username, password);
                break;
        case NCACN_IP_TCP:
-               status = dcerpc_pipe_connect_ncacn_ip_tcp(p, binding, pipe_uuid, pipe_version,
+               status = dcerpc_pipe_connect_ncacn_ip_tcp(pp, binding, pipe_uuid, pipe_version,
                                                          domain, username, password);
                break;
        case NCACN_UNIX_STREAM:
-               status = dcerpc_pipe_connect_ncacn_unix_stream(p, binding, pipe_uuid, pipe_version, domain, username, password);
+               status = dcerpc_pipe_connect_ncacn_unix_stream(pp, 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);
+               status = dcerpc_pipe_connect_ncalrpc(pp, binding, pipe_uuid, pipe_version, 
+                                                    domain, username, password);
                break;
        default:
                return NT_STATUS_NOT_SUPPORTED;
@@ -1051,7 +1092,7 @@ NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p,
 
 /* 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,
@@ -1061,23 +1102,23 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p,
 {
        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);
 
-       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, domain, username, password);
 
-       status = dcerpc_pipe_connect_b(p, &b, pipe_uuid, pipe_version, domain, username, password);
+       talloc_free(tmp_ctx);
 
-       talloc_destroy(mem_ctx);
        return status;
 }
 
@@ -1097,34 +1138,34 @@ NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe *
        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, pipe_name);
                break;
 
        case NCACN_IP_TCP:
-               status = dcerpc_parse_binding(p, p->binding_string, &b);
+               status = dcerpc_parse_binding(p, p->conn->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_parse_binding(p, p->binding_string, &b);
+               status = dcerpc_parse_binding(p, p->conn->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);
+               status = dcerpc_pipe_open_pipe((*p2)->conn, b.endpoint);
                break;
 
        default:
@@ -1132,22 +1173,22 @@ NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe *
        }
 
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(*p2);
                return status;
        }
 
-       talloc_steal(p, *p2);
-
-       (*p2)->flags = p->flags;
+       (*p2)->conn->flags = p->conn->flags;
 
        status = dcerpc_bind_auth_none(*p2, pipe_uuid, pipe_version);
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(*p2);
                 return status;
         }
 
        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 ... */
@@ -1162,7 +1203,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);
 }
 
 
@@ -1199,3 +1240,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;
+}