diff options
| author | Simo Sorce <idra@samba.org> | 2011-07-21 11:02:59 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-07-21 19:50:02 +0200 |
| commit | 156a0ffe542339952a6e2db191ffc586227edd5a (patch) | |
| tree | 84d6b14cb96e7b0ed9c4311df175e01ef0115f70 /source3/rpc_server/rpc_server.c | |
| parent | 759a04e58a88b400dbf0cafc2b86ab58ea196433 (diff) | |
| download | samba-156a0ffe542339952a6e2db191ffc586227edd5a.tar.gz samba-156a0ffe542339952a6e2db191ffc586227edd5a.tar.bz2 samba-156a0ffe542339952a6e2db191ffc586227edd5a.zip | |
s3-rpc_server: Create common function to allocate pipes_struct
Avoid code duplication and fix bug where a new pipe was not added to
InternalPipes upon creation in make_server_pipes_struct()
Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Thu Jul 21 19:50:02 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/rpc_server/rpc_server.c')
| -rw-r--r-- | source3/rpc_server/rpc_server.c | 45 |
1 files changed, 8 insertions, 37 deletions
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 7b0982e9b1..43e549b5ae 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "ntdomain.h" +#include "rpc_server/rpc_pipes.h" #include "rpc_server/rpc_server.h" #include "rpc_dce.h" #include "librpc/gen_ndr/netlogon.h" @@ -64,29 +64,18 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, { struct pipes_struct *p; NTSTATUS status; + int ret; - p = talloc_zero(mem_ctx, struct pipes_struct); - if (!p) { - *perrno = ENOMEM; - return -1; - } - - p->transport = transport; - p->ncalrpc_as_system = ncalrpc_as_system; - - p->mem_ctx = talloc_named(p, 0, "pipe %s %p", pipe_name, p); - if (!p->mem_ctx) { - TALLOC_FREE(p); - *perrno = ENOMEM; + ret = make_base_pipes_struct(mem_ctx, NULL, pipe_name, + transport, RPC_LITTLE_ENDIAN, + ncalrpc_as_system, + remote_address, local_address, &p); + if (ret) { + *perrno = ret; return -1; } p->msg_ctx = msg_ctx; - data_blob_free(&p->in_data.data); - data_blob_free(&p->in_data.pdu); - - p->endian = RPC_LITTLE_ENDIAN; - if (session_info->unix_token && session_info->unix_info && session_info->security_token) { /* Don't call create_local_token(), we already have the full details here */ p->session_info = talloc_steal(p, session_info); @@ -145,24 +134,6 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, } } - p->remote_address = tsocket_address_copy(remote_address, p); - if (p->remote_address == NULL) { - TALLOC_FREE(p); - *perrno = ENOMEM; - return -1; - } - - if (local_address != NULL) { - p->local_address = tsocket_address_copy(local_address, p); - if (p->local_address == NULL) { - TALLOC_FREE(p); - *perrno = ENOMEM; - return -1; - } - } - - talloc_set_destructor(p, close_internal_rpc_pipe_hnd); - *_p = p; return 0; } |