sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

s3-rpc_server: Improved the dcerpc_ncacn_accept switch.

Browse Source 
Signed-off-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider 2011-03-01 19:10:02 +01:00 committed by Günther Deschner
parent 42e9dde646
commit 5ce12e0beb
1 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source3/rpc_server/rpc_server.c
View File

@ -1032,21 +1032,6 @@ static void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
return;
}
switch (transport) {
case NCACN_IP_TCP:
ncacn_conn->ep.port = port;
break;
case NCALRPC:
case NCACN_NP:
ncacn_conn->ep.name = talloc_strdup(ncacn_conn, name);
break;
default:
DEBUG(0, ("unknown dcerpc transport: %u!\n",
transport));
talloc_free(ncacn_conn);
close(s);
return;
}
ncacn_conn->transport = transport;
ncacn_conn->syntax_id = syntax_id;
ncacn_conn->ev_ctx = ev_ctx;
@ -1084,6 +1069,44 @@ static void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
}
}
switch (transport) {
case NCACN_IP_TCP:
ncacn_conn->ep.port = port;
pipe_name = tsocket_address_string(ncacn_conn->client,
ncacn_conn);
if (pipe_name == NULL) {
close(s);
talloc_free(ncacn_conn);
return;
}
break;
case NCALRPC:
case NCACN_NP:
ncacn_conn->ep.name = talloc_strdup(ncacn_conn, name);
if (ncacn_conn->ep.name == NULL) {
close(s);
talloc_free(ncacn_conn);
return;
}
pipe_name = talloc_strdup(ncacn_conn,
name);
if (pipe_name == NULL) {
close(s);
talloc_free(ncacn_conn);
return;
}
break;
default:
DEBUG(0, ("unknown dcerpc transport: %u!\n",
transport));
talloc_free(ncacn_conn);
close(s);
return;
}
rc = set_blocking(s, false);
if (rc < 0) {
DEBUG(2, ("Failed to set dcerpc socket to non-blocking\n"));
@ -1104,20 +1127,6 @@ static void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
return;
}
switch (ncacn_conn->transport) {
case NCACN_IP_TCP:
pipe_name = tsocket_address_string(ncacn_conn->client,
ncacn_conn);
break;
case NCALRPC:
pipe_name = talloc_strdup(ncacn_conn,
ncacn_conn->ep.name);
break;
default:
talloc_free(ncacn_conn);
return;
}
if (tsocket_address_is_inet(ncacn_conn->client, "ip")) {
cli_str = ncacn_conn->client_name;
} else {