From 3344adc3404df47f02f6eb3096cb623ae94850b8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 3 Jun 2010 22:01:46 +0200 Subject: s3-rpc: Seperate rpc_srv_register for plain connection. This will make it possible to create plain rpc named pipe connnections. Reviewed-by: Simo Sorce --- source3/rpc_server/srv_pipe.c | 157 +++++++++--------------------------------- 1 file changed, 32 insertions(+), 125 deletions(-) (limited to 'source3/rpc_server/srv_pipe.c') diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 50914acfbd..fccc41c33a 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -28,6 +28,7 @@ */ #include "includes.h" +#include "srv_pipe_internal.h" #include "../librpc/gen_ndr/ndr_schannel.h" #include "../libcli/auth/schannel.h" #include "../libcli/auth/spnego.h" @@ -741,23 +742,6 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) return True; } -/******************************************************************* - The switch table for the pipe names and the functions to handle them. -*******************************************************************/ - -struct rpc_table { - struct { - const char *clnt; - const char *srv; - } pipe; - struct ndr_syntax_id rpc_interface; - const struct api_struct *cmds; - int n_cmds; -}; - -static struct rpc_table *rpc_lookup; -static int rpc_lookup_size; - /******************************************************************* This is the "stage3" NTLMSSP response after a bind request and reply. *******************************************************************/ @@ -1044,25 +1028,18 @@ static bool check_bind_req(struct pipes_struct *p, struct ndr_syntax_id* transfer, uint32 context_id) { - int i=0; struct pipe_rpc_fns *context_fns; DEBUG(3,("check_bind_req for %s\n", get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */ - - for (i=0; i \\PIPE\\%s\n", + rpc_srv_get_pipe_cli_name(abstract), + rpc_srv_get_pipe_srv_name(abstract))); + } else { return false; } @@ -1072,8 +1049,8 @@ static bool check_bind_req(struct pipes_struct *p, return False; } - context_fns->cmds = rpc_lookup[i].cmds; - context_fns->n_cmds = rpc_lookup[i].n_cmds; + context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract); + context_fns->cmds = rpc_srv_get_pipe_cmds(abstract); context_fns->context_id = context_id; /* add to the list of open contexts */ @@ -1083,59 +1060,6 @@ static bool check_bind_req(struct pipes_struct *p, return True; } -/******************************************************************* - Register commands to an RPC pipe -*******************************************************************/ - -NTSTATUS rpc_srv_register(int version, const char *clnt, const char *srv, - const struct ndr_interface_table *iface, - const struct api_struct *cmds, int size) -{ - struct rpc_table *rpc_entry; - - if (!clnt || !srv || !cmds) { - return NT_STATUS_INVALID_PARAMETER; - } - - if (version != SMB_RPC_INTERFACE_VERSION) { - DEBUG(0,("Can't register rpc commands!\n" - "You tried to register a rpc module with SMB_RPC_INTERFACE_VERSION %d" - ", while this version of samba uses version %d!\n", - version,SMB_RPC_INTERFACE_VERSION)); - return NT_STATUS_OBJECT_TYPE_MISMATCH; - } - - /* TODO: - * - * we still need to make sure that don't register the same commands twice!!! - * - * --metze - */ - - /* We use a temporary variable because this call can fail and - rpc_lookup will still be valid afterwards. It could then succeed if - called again later */ - rpc_lookup_size++; - rpc_entry = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(rpc_lookup, struct rpc_table, rpc_lookup_size); - if (NULL == rpc_entry) { - rpc_lookup_size--; - DEBUG(0, ("rpc_pipe_register_commands: memory allocation failed\n")); - return NT_STATUS_NO_MEMORY; - } else { - rpc_lookup = rpc_entry; - } - - rpc_entry = rpc_lookup + (rpc_lookup_size - 1); - ZERO_STRUCTP(rpc_entry); - rpc_entry->pipe.clnt = SMB_STRDUP(clnt); - rpc_entry->pipe.srv = SMB_STRDUP(srv); - rpc_entry->rpc_interface = iface->syntax_id; - rpc_entry->cmds = cmds; - rpc_entry->n_cmds = size; - - return NT_STATUS_OK; -} - /** * Is a named pipe known? * @param[in] cli_filename The pipe name requested by the client @@ -1144,7 +1068,6 @@ NTSTATUS rpc_srv_register(int version, const char *clnt, const char *srv, bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax) { const char *pipename = cli_filename; - int i; NTSTATUS status; if (strnequal(pipename, "\\PIPE\\", 6)) { @@ -1160,11 +1083,8 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax) return false; } - for (i=0; ipipe_bound) { @@ -1724,19 +1641,12 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) * Try and find the correct pipe name to ensure * that this is a pipe name we support. */ - - for (i = 0; i < rpc_lookup_size; i++) { - if (ndr_syntax_id_equal(&rpc_lookup[i].rpc_interface, - &hdr_rb.rpc_context[0].abstract)) { - DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", - rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv)); - break; - } - } - - if (i == rpc_lookup_size) { - NTSTATUS status; - + id = hdr_rb.rpc_context[0].abstract; + if (rpc_srv_pipe_exists_by_id(&id)) { + DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", + rpc_srv_get_pipe_cli_name(&id), + rpc_srv_get_pipe_srv_name(&id))); + } else { status = smb_probe_module( "rpc", get_pipe_name_from_syntax( talloc_tos(), @@ -1752,19 +1662,16 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) prs_mem_free(&out_auth); return setup_bind_nak(p); - } - - for (i = 0; i < rpc_lookup_size; i++) { - if (strequal(rpc_lookup[i].pipe.clnt, - get_pipe_name_from_syntax(talloc_tos(), - &p->syntax))) { - DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", - rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv)); - break; - } - } - - if (i == rpc_lookup_size) { + } + + if (rpc_srv_get_pipe_interface_by_cli_name( + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax), + &id)) { + DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", + rpc_srv_get_pipe_cli_name(&id), + rpc_srv_get_pipe_srv_name(&id))); + } else { DEBUG(0, ("module %s doesn't provide functions for " "pipe %s!\n", get_pipe_name_from_syntax(talloc_tos(), @@ -1777,7 +1684,7 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) /* name has to be \PIPE\xxxxx */ fstrcpy(ack_pipe_name, "\\PIPE\\"); - fstrcat(ack_pipe_name, rpc_lookup[i].pipe.srv); + fstrcat(ack_pipe_name, rpc_srv_get_pipe_srv_name(&id)); DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__)); -- cgit