sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r17079: Remove an attempt to connect on ncacn_ip_tcp transport after failure

Browse Source 
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)
This commit is contained in:
Rafal Szczesniak 2006-07-16 12:29:37 +00:00 committed by Gerald (Jerry) Carter
parent f139daccf7
commit 45b64e394d
1 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source4/libnet/libnet_rpc.c
View File

@ -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);
}