summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-26 13:56:06 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-27 13:00:25 +0200
commitba703cb8e90070447dda46a3356f6a49b2fee537 (patch)
treee5e8cd931b2d9baa01f55e1e529eb4e2db07f4cf /source4
parentcf3c595b9c6778ee4dea28176936013bc1f1e876 (diff)
downloadsamba-ba703cb8e90070447dda46a3356f6a49b2fee537.tar.gz
samba-ba703cb8e90070447dda46a3356f6a49b2fee537.tar.bz2
samba-ba703cb8e90070447dda46a3356f6a49b2fee537.zip
s4:service_named_pipe: use the passed client and server addresses
This gives the rpc server code the correct client and server ip addresses for ncacn_np. metze
Diffstat (limited to 'source4')
-rw-r--r--source4/smbd/service_named_pipe.c39
1 files changed, 38 insertions, 1 deletions
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c
index 6409a0099e..bce663ba8e 100644
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/smbd/service_named_pipe.c
@@ -165,6 +165,7 @@ static void named_pipe_auth_request(struct tevent_req *subreq)
struct named_pipe_auth_rep pipe_reply;
struct auth_context *auth_context;
NTSTATUS status;
+ int ret;
call = talloc(pipe_conn, struct named_pipe_call);
if (call == NULL) {
@@ -337,6 +338,43 @@ static void named_pipe_auth_request(struct tevent_req *subreq)
pipe_reply.info.info3.device_state = 0xff | 0x0400 | 0x0100;
pipe_reply.info.info3.allocation_size = 4096;
+ if (pipe_request.info.info3.server_addr == NULL) {
+ pipe_reply.status = NT_STATUS_INVALID_ADDRESS;
+ DEBUG(2, ("Missing server address\n"));
+ goto reply;
+ }
+ if (pipe_request.info.info3.client_addr == NULL) {
+ pipe_reply.status = NT_STATUS_INVALID_ADDRESS;
+ DEBUG(2, ("Missing client address\n"));
+ goto reply;
+ }
+
+ ret = tsocket_address_inet_from_strings(conn, "ip",
+ pipe_request.info.info3.server_addr,
+ pipe_request.info.info3.server_port,
+ &conn->local_address);
+ if (ret != 0) {
+ DEBUG(2, ("Invalid server address[%s] port[%u] - %s\n",
+ pipe_request.info.info3.server_addr,
+ pipe_request.info.info3.server_port,
+ strerror(errno)));
+ pipe_reply.status = NT_STATUS_INVALID_ADDRESS;
+ goto reply;
+ }
+
+ ret = tsocket_address_inet_from_strings(conn, "ip",
+ pipe_request.info.info3.client_addr,
+ pipe_request.info.info3.client_port,
+ &conn->remote_address);
+ if (ret != 0) {
+ DEBUG(2, ("Invalid client address[%s] port[%u] - %s\n",
+ pipe_request.info.info3.client_addr,
+ pipe_request.info.info3.client_port,
+ strerror(errno)));
+ pipe_reply.status = NT_STATUS_INVALID_ADDRESS;
+ goto reply;
+ }
+
if (pipe_request.info.info3.sam_info3 == NULL) {
/*
* anon connection, we don't create a session info
@@ -384,7 +422,6 @@ static void named_pipe_auth_request(struct tevent_req *subreq)
OM_uint32 minor_status;
gss_buffer_desc cred_token;
gss_cred_id_t cred_handle;
- int ret;
const char *error_string;
DEBUG(10, ("named_pipe_auth: delegated credentials supplied by client\n"));