summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafal Szczesniak <mimir@samba.org>2006-07-16 12:29:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:11 -0500
commit45b64e394d19c64ec2e0a65e75b52c5024abf592 (patch)
treebddd9b5ebdf5dda57902ca29c7bb21fef443b1f8
parentf139daccf7298cd5d8d84d84d0ff7bb0f8c61005 (diff)
downloadsamba-45b64e394d19c64ec2e0a65e75b52c5024abf592.tar.gz
samba-45b64e394d19c64ec2e0a65e75b52c5024abf592.tar.bz2
samba-45b64e394d19c64ec2e0a65e75b52c5024abf592.zip
r17079: Remove an attempt to connect on ncacn_ip_tcp transport after failure
on ncacn_np, as abartlet suggested. Also, named pipe remains the default transport for all kinds of servers to be contacted. rafal (This used to be commit 76888c74a66317a9888ea4c0965f0d33124c222f)
-rw-r--r--source4/libnet/libnet_rpc.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 31d2b4dbf4..1e605201ae 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -32,7 +32,6 @@ struct rpc_connect_srv_state {
struct libnet_context *ctx;
struct libnet_RpcConnect r;
const char *binding;
- enum dcerpc_transport_t trans;
};
@@ -74,14 +73,9 @@ static struct composite_context* libnet_RpcConnectSrv_send(struct libnet_context
/* prepare binding string */
switch (r->level) {
case LIBNET_RPC_CONNECT_DC:
- s->binding = talloc_asprintf(s, "ncacn_ip_tcp:%s", r->in.name);
- s->trans = NCACN_IP_TCP;
- break;
-
case LIBNET_RPC_CONNECT_PDC:
case LIBNET_RPC_CONNECT_SERVER:
s->binding = talloc_asprintf(s, "ncacn_np:%s", r->in.name);
- s->trans = NCACN_NP;
break;
case LIBNET_RPC_CONNECT_BINDING:
@@ -121,38 +115,6 @@ static void continue_pipe_connect(struct composite_context *ctx)
/* receive result of rpc pipe connection */
c->status = dcerpc_pipe_connect_recv(ctx, c, &s->r.out.dcerpc_pipe);
- if (NT_STATUS_EQUAL(c->status, NT_STATUS_IO_TIMEOUT)) {
- switch (s->r.level) {
- case LIBNET_RPC_CONNECT_DC:
- if (s->trans == NCACN_IP_TCP) {
- s->binding = talloc_asprintf(s, "ncacn_np:%s", s->r.in.name);
- s->trans = NCACN_NP;
- }
- break;
-
- case LIBNET_RPC_CONNECT_SERVER:
- if (s->trans == NCACN_NP) {
- s->binding = talloc_asprintf(s, "ncacn_ip_tcp:%s", s->r.in.name);
- s->trans = NCACN_IP_TCP;
- }
- break;
-
- default:
- if (!composite_is_ok(c)) return;
- s->r.out.error_string = NULL;
- composite_done(c);
- }
-
- /* connect to remote dcerpc pipe */
- pipe_connect_req = dcerpc_pipe_connect_send(c, &s->r.out.dcerpc_pipe,
- s->binding, s->r.in.dcerpc_iface,
- s->ctx->cred, c->event_ctx);
- if (composite_nomem(pipe_connect_req, c)) return;
-
- composite_continue(c, pipe_connect_req, continue_pipe_connect, c);
- return;
- }
-
s->r.out.error_string = NULL;
composite_done(c);
}