The branch, master has been updated
via b738e09 librpc/rpc: move dcerpc_binding_handle stuff to rpc_common.h
via 5657c96 s3:librpc/rpc: remove unused dcerpc_pipe define hack
via c774a50 s4:librpc/rpc: s/struct dcerpc_connection/struct
dcecli_connection/g
via 6771ade pidl:Samba4/NDR/Client: fix arguments to warning()
via f3465da pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe'
related code
from 0726b29 s3:idmap_ldap: fix a few typos in a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b738e092a22edb192243d2eee10c31a370be71e3
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 11 10:31:25 2011 +0100
librpc/rpc: move dcerpc_binding_handle stuff to rpc_common.h
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Fri Mar 11 12:28:08 CET 2011 on sn-devel-104
commit 5657c96714518b90b04b5283c87c4d0050eb2418
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 11 09:56:10 2011 +0100
s3:librpc/rpc: remove unused dcerpc_pipe define hack
metze
commit c774a50aaf12924ff89430ae9d91e77d97616c72
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 11 08:27:00 2011 +0100
s4:librpc/rpc: s/struct dcerpc_connection/struct dcecli_connection/g
The name 'struct dcerpc_connection' will be used in the new generic
dcerpc code. It will be used for client and server.
metze
commit 6771ade5e7933af57b286870d73e7773521b8fdd
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 11 09:01:00 2011 +0100
pidl:Samba4/NDR/Client: fix arguments to warning()
We want the file:line: information displayed.
metze
commit f3465da07242cfa3f45da668c7ffa86e8beacf0e
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 11 09:00:13 2011 +0100
pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe' related code
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/rpc/rpc_common.h | 103 +++++++++++++++++++-
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 6 +-
source3/librpc/rpc/dcerpc.h | 156 +-----------------------------
source4/librpc/rpc/dcerpc.c | 48 +++++-----
source4/librpc/rpc/dcerpc.h | 146 +++-------------------------
source4/librpc/rpc/dcerpc_smb.c | 38 ++++----
source4/librpc/rpc/dcerpc_smb2.c | 36 ++++----
source4/librpc/rpc/dcerpc_sock.c | 46 +++++-----
source4/librpc/rpc/dcerpc_util.c | 4 +-
source4/librpc/wscript_build | 5 +-
11 files changed, 209 insertions(+), 381 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index 3f5216b..5d1bde0 100644
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -1,8 +1,41 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Copyright (C) Stefan Metzmacher 2010-2011
+ Copyright (C) Andrew Tridgell 2010-2011
+ Copyright (C) Simo Sorce 2010
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifndef __DEFAULT_LIBRPC_RPCCOMMON_H__
#define __DEFAULT_LIBRPC_RPCCOMMON_H__
+struct dcerpc_binding_handle;
+struct GUID;
+struct ndr_interface_table;
+struct ndr_interface_call;
+struct ndr_push;
+struct ndr_pull;
+struct ncacn_packet;
+struct tevent_context;
+struct tstream_context;
+
/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
+const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
+NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
/* The following definitions come from ../librpc/rpc/binding.c */
@@ -52,6 +85,58 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req
*req,
/* The following definitions come from ../librpc/rpc/binding_handle.c */
+struct dcerpc_binding_handle_ops {
+ const char *name;
+
+ bool (*is_connected)(struct dcerpc_binding_handle *h);
+ uint32_t (*set_timeout)(struct dcerpc_binding_handle *h,
+ uint32_t timeout);
+
+ struct tevent_req *(*raw_call_send)(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct dcerpc_binding_handle *h,
+ const struct GUID *object,
+ uint32_t opnum,
+ uint32_t in_flags,
+ const uint8_t *in_data,
+ size_t in_length);
+ NTSTATUS (*raw_call_recv)(struct tevent_req *req,
+ TALLOC_CTX *mem_ctx,
+ uint8_t **out_data,
+ size_t *out_length,
+ uint32_t *out_flags);
+
+ struct tevent_req *(*disconnect_send)(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct dcerpc_binding_handle *h);
+ NTSTATUS (*disconnect_recv)(struct tevent_req *req);
+
+ /* TODO: remove the following functions */
+ bool (*push_bigendian)(struct dcerpc_binding_handle *h);
+ bool (*ref_alloc)(struct dcerpc_binding_handle *h);
+ bool (*use_ndr64)(struct dcerpc_binding_handle *h);
+ void (*do_ndr_print)(struct dcerpc_binding_handle *h,
+ int ndr_flags,
+ const void *struct_ptr,
+ const struct ndr_interface_call *call);
+ void (*ndr_push_failed)(struct dcerpc_binding_handle *h,
+ NTSTATUS error,
+ const void *struct_ptr,
+ const struct ndr_interface_call *call);
+ void (*ndr_pull_failed)(struct dcerpc_binding_handle *h,
+ NTSTATUS error,
+ const DATA_BLOB *blob,
+ const struct ndr_interface_call *call);
+ NTSTATUS (*ndr_validate_in)(struct dcerpc_binding_handle *h,
+ TALLOC_CTX *mem_ctx,
+ const DATA_BLOB *blob,
+ const struct ndr_interface_call *call);
+ NTSTATUS (*ndr_validate_out)(struct dcerpc_binding_handle *h,
+ struct ndr_pull *pull_in,
+ const void *struct_ptr,
+ const struct ndr_interface_call *call);
+};
+
struct dcerpc_binding_handle *_dcerpc_binding_handle_create(TALLOC_CTX
*mem_ctx,
const struct dcerpc_binding_handle_ops
*ops,
const struct GUID *object,
@@ -60,12 +145,23 @@ struct dcerpc_binding_handle
*_dcerpc_binding_handle_create(TALLOC_CTX *mem_ctx,
size_t psize,
const char *type,
const char *location);
+#define dcerpc_binding_handle_create(mem_ctx, ops, object, table, \
+ state, type, location) \
+ _dcerpc_binding_handle_create(mem_ctx, ops, object, table, \
+ state, sizeof(type), #type, location)
+
void *_dcerpc_binding_handle_data(struct dcerpc_binding_handle *h);
-void dcerpc_binding_handle_set_sync_ev(struct dcerpc_binding_handle *h,
- struct tevent_context *ev);
+#define dcerpc_binding_handle_data(_h, _type) \
+ talloc_get_type_abort(_dcerpc_binding_handle_data(_h), _type)
+
+_DEPRECATED_ void dcerpc_binding_handle_set_sync_ev(struct
dcerpc_binding_handle *h,
+ struct tevent_context *ev);
+
bool dcerpc_binding_handle_is_connected(struct dcerpc_binding_handle *h);
+
uint32_t dcerpc_binding_handle_set_timeout(struct dcerpc_binding_handle *h,
uint32_t timeout);
+
struct tevent_req *dcerpc_binding_handle_raw_call_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct dcerpc_binding_handle *h,
@@ -79,10 +175,12 @@ NTSTATUS dcerpc_binding_handle_raw_call_recv(struct
tevent_req *req,
uint8_t **out_data,
size_t *out_length,
uint32_t *out_flags);
+
struct tevent_req *dcerpc_binding_handle_disconnect_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct dcerpc_binding_handle
*h);
NTSTATUS dcerpc_binding_handle_disconnect_recv(struct tevent_req *req);
+
struct tevent_req *dcerpc_binding_handle_call_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct dcerpc_binding_handle *h,
@@ -98,4 +196,5 @@ NTSTATUS dcerpc_binding_handle_call(struct
dcerpc_binding_handle *h,
uint32_t opnum,
TALLOC_CTX *r_mem,
void *r_ptr);
+
#endif /* __DEFAULT_LIBRPC_RPCCOMMON_H__ */
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index ab4f524..c796b46 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -743,7 +743,7 @@ sub ParseFunction($$$)
$self->pidl_both(" * dcerpc_$fn->{NAME}()");
$self->pidl_both(" */");
$self->pidl_both("");
- warning($fn, "$fn->{NAME}: dcerpc client does not support pipe
yet");
+ warning($fn->{ORIGINAL}, "$fn->{NAME}: dcerpc client does not
support pipe yet");
return;
}
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index f84610d..7cda272 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2466,7 +2466,7 @@ sub ParseGeneratePipeArray($$$)
$self->deindent;
$self->pidl("},");
}
- $self->pidl("{ NULL, NULL, 0, NULL, NULL, NULL, NULL }");
+ $self->pidl("{ NULL, NULL, 0, NULL, NULL, NULL }");
$self->deindent;
$self->pidl("};");
$self->pidl("");
@@ -2523,11 +2523,11 @@ sub FunctionCallEntry($$)
my $out_pipes_ptr = "NULL";
if ($in_pipes) {
- $in_pipes_ptr = "\&$d->{NAME}_in_pipes";
+ $in_pipes_ptr = "$d->{NAME}_in_pipes";
}
if ($out_pipes) {
- $out_pipes_ptr = "\&$d->{NAME}_out_pipes";
+ $out_pipes_ptr = "$d->{NAME}_out_pipes";
}
$self->pidl("\t{");
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 72a8ad5..3cfd229 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -162,160 +162,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
DATA_BLOB *raw_pkt,
size_t *pad_len);
-struct dcerpc_binding_handle;
-struct GUID;
-struct ndr_interface_table;
-struct ndr_interface_call;
-struct ndr_push;
-struct ndr_pull;
-struct tevent_context;
-struct tstream_context;
-
-/* The following definitions come from ../librpc/rpc/dcerpc_util.c */
-
-void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
-uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
-void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
-struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct tstream_context
*stream);
-NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req *req,
- TALLOC_CTX *mem_ctx,
- struct ncacn_packet **pkt,
- DATA_BLOB *buffer);
-uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
- TALLOC_CTX *mem_ctx,
- DATA_BLOB *pkt_trailer,
- struct dcerpc_auth *auth,
- uint32_t *auth_length,
- bool auth_data_only);
-
-/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
-
-const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
-NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
-
-/*
- * This is just a hack this should never be used in code,
- * but it's needed to build the compat stubs for now
- */
-struct __do_not_use_dcerpc_pipe {
- struct dcerpc_binding_handle *binding_handle;
-};
-#define dcerpc_pipe __do_not_use_dcerpc_pipe
-
-
-struct dcerpc_binding_handle_ops {
- const char *name;
-
- bool (*is_connected)(struct dcerpc_binding_handle *h);
- uint32_t (*set_timeout)(struct dcerpc_binding_handle *h,
- uint32_t timeout);
-
- struct tevent_req *(*raw_call_send)(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct dcerpc_binding_handle *h,
- const struct GUID *object,
- uint32_t opnum,
- uint32_t in_flags,
- const uint8_t *in_data,
- size_t in_length);
- NTSTATUS (*raw_call_recv)(struct tevent_req *req,
- TALLOC_CTX *mem_ctx,
- uint8_t **out_data,
- size_t *out_length,
- uint32_t *out_flags);
-
- struct tevent_req *(*disconnect_send)(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct dcerpc_binding_handle *h);
- NTSTATUS (*disconnect_recv)(struct tevent_req *req);
-
- /* TODO: remove the following functions */
- bool (*push_bigendian)(struct dcerpc_binding_handle *h);
- bool (*ref_alloc)(struct dcerpc_binding_handle *h);
- bool (*use_ndr64)(struct dcerpc_binding_handle *h);
- void (*do_ndr_print)(struct dcerpc_binding_handle *h,
- int ndr_flags,
- const void *struct_ptr,
- const struct ndr_interface_call *call);
- void (*ndr_push_failed)(struct dcerpc_binding_handle *h,
- NTSTATUS error,
- const void *struct_ptr,
- const struct ndr_interface_call *call);
- void (*ndr_pull_failed)(struct dcerpc_binding_handle *h,
- NTSTATUS error,
- const DATA_BLOB *blob,
- const struct ndr_interface_call *call);
- NTSTATUS (*ndr_validate_in)(struct dcerpc_binding_handle *h,
- TALLOC_CTX *mem_ctx,
- const DATA_BLOB *blob,
- const struct ndr_interface_call *call);
- NTSTATUS (*ndr_validate_out)(struct dcerpc_binding_handle *h,
- struct ndr_pull *pull_in,
- const void *struct_ptr,
- const struct ndr_interface_call *call);
-};
-
-struct dcerpc_binding_handle *_dcerpc_binding_handle_create(TALLOC_CTX
*mem_ctx,
- const struct dcerpc_binding_handle_ops
*ops,
- const struct GUID *object,
- const struct ndr_interface_table *table,
- void *pstate,
- size_t psize,
- const char *type,
- const char *location);
-#define dcerpc_binding_handle_create(mem_ctx, ops, object, table, \
- state, type, location) \
- _dcerpc_binding_handle_create(mem_ctx, ops, object, table, \
- state, sizeof(type), #type, location)
-
-void *_dcerpc_binding_handle_data(struct dcerpc_binding_handle *h);
-#define dcerpc_binding_handle_data(_h, _type) \
- talloc_get_type_abort(_dcerpc_binding_handle_data(_h), _type)
-
-_DEPRECATED_ void dcerpc_binding_handle_set_sync_ev(struct
dcerpc_binding_handle *h,
- struct tevent_context *ev);
-
-bool dcerpc_binding_handle_is_connected(struct dcerpc_binding_handle *h);
-
-uint32_t dcerpc_binding_handle_set_timeout(struct dcerpc_binding_handle *h,
- uint32_t timeout);
-
-struct tevent_req *dcerpc_binding_handle_raw_call_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct dcerpc_binding_handle *h,
- const struct GUID *object,
- uint32_t opnum,
- uint32_t in_flags,
- const uint8_t *in_data,
- size_t in_length);
-NTSTATUS dcerpc_binding_handle_raw_call_recv(struct tevent_req *req,
- TALLOC_CTX *mem_ctx,
- uint8_t **out_data,
- size_t *out_length,
- uint32_t *out_flags);
-
-struct tevent_req *dcerpc_binding_handle_disconnect_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct dcerpc_binding_handle
*h);
-NTSTATUS dcerpc_binding_handle_disconnect_recv(struct tevent_req *req);
-
-struct tevent_req *dcerpc_binding_handle_call_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- struct dcerpc_binding_handle *h,
- const struct GUID *object,
- const struct ndr_interface_table *table,
- uint32_t opnum,
- TALLOC_CTX *r_mem,
- void *r_ptr);
-NTSTATUS dcerpc_binding_handle_call_recv(struct tevent_req *req);
-NTSTATUS dcerpc_binding_handle_call(struct dcerpc_binding_handle *h,
- const struct GUID *object,
- const struct ndr_interface_table *table,
- uint32_t opnum,
- TALLOC_CTX *r_mem,
- void *r_ptr);
+#include "../librpc/rpc/rpc_common.h"
#endif /* __DCERPC_H__ */
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 3b67512..d467845 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -38,20 +38,20 @@ _PUBLIC_ NTSTATUS dcerpc_init(struct loadparm_context
*lp_ctx)
return gensec_init(lp_ctx);
}
-static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS
status);
-static void dcerpc_ship_next_request(struct dcerpc_connection *c);
+static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS
status);
+static void dcerpc_ship_next_request(struct dcecli_connection *c);
static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
const struct GUID *object,
uint16_t opnum,
DATA_BLOB *stub_data);
-static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
+static NTSTATUS dcerpc_ndr_validate_in(struct dcecli_connection *c,
TALLOC_CTX *mem_ctx,
DATA_BLOB blob,
size_t struct_size,
ndr_push_flags_fn_t ndr_push,
ndr_pull_flags_fn_t ndr_pull);
-static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
+static NTSTATUS dcerpc_ndr_validate_out(struct dcecli_connection *c,
struct ndr_pull *pull_in,
void *struct_ptr,
size_t struct_size,
@@ -60,7 +60,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct
dcerpc_connection *c,
ndr_print_function_t ndr_print);
/* destroy a dcerpc connection */
-static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
+static int dcerpc_connection_destructor(struct dcecli_connection *conn)
{
if (conn->dead) {
conn->free_skipped = true;
@@ -74,12 +74,12 @@ static int dcerpc_connection_destructor(struct
dcerpc_connection *conn)
/* initialise a dcerpc connection.
the event context is optional
*/
-static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
+static struct dcecli_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev)
{
- struct dcerpc_connection *c;
+ struct dcecli_connection *c;
- c = talloc_zero(mem_ctx, struct dcerpc_connection);
+ c = talloc_zero(mem_ctx, struct dcecli_connection);
if (!c) {
return NULL;
}
@@ -554,7 +554,7 @@ _PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX
*mem_ctx, struct tevent
/*
choose the next call id to use
*/
-static uint32_t next_call_id(struct dcerpc_connection *c)
+static uint32_t next_call_id(struct dcecli_connection *c)
{
c->call_id++;
if (c->call_id == 0) {
@@ -566,7 +566,7 @@ static uint32_t next_call_id(struct dcerpc_connection *c)
/**
setup for a ndr pull, also setting up any flags from the binding string
*/
-static struct ndr_pull *ndr_pull_init_flags(struct dcerpc_connection *c,
+static struct ndr_pull *ndr_pull_init_flags(struct dcecli_connection *c,
DATA_BLOB *blob, TALLOC_CTX
*mem_ctx)
{
struct ndr_pull *ndr = ndr_pull_init_blob(blob, mem_ctx);
@@ -592,7 +592,7 @@ static struct ndr_pull *ndr_pull_init_flags(struct
dcerpc_connection *c,
parse a data blob into a ncacn_packet structure. This handles both
input and output packets
*/
-static NTSTATUS ncacn_pull(struct dcerpc_connection *c, DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
+static NTSTATUS ncacn_pull(struct dcecli_connection *c, DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
struct ncacn_packet *pkt)
{
struct ndr_pull *ndr;
@@ -618,7 +618,7 @@ static NTSTATUS ncacn_pull(struct dcerpc_connection *c,
DATA_BLOB *blob, TALLOC_
/*
parse the authentication information on a dcerpc response packet
*/
-static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c,
TALLOC_CTX *mem_ctx,
+static NTSTATUS ncacn_pull_request_auth(struct dcecli_connection *c,
TALLOC_CTX *mem_ctx,
DATA_BLOB *raw_packet,
struct ncacn_packet *pkt)
{
@@ -706,7 +706,7 @@ static NTSTATUS ncacn_pull_request_auth(struct
dcerpc_connection *c, TALLOC_CTX
/*
push a dcerpc request packet into a blob, possibly signing it.
*/
-static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
+static NTSTATUS ncacn_push_request_sign(struct dcecli_connection *c,
DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
size_t sig_size,
struct ncacn_packet *pkt)
@@ -856,7 +856,7 @@ static NTSTATUS ncacn_push_request_sign(struct
dcerpc_connection *c,
/*
fill in the fixed values in a dcerpc header
*/
-static void init_ncacn_hdr(struct dcerpc_connection *c, struct ncacn_packet
*pkt)
+static void init_ncacn_hdr(struct dcecli_connection *c, struct ncacn_packet
*pkt)
{
pkt->rpc_vers = 5;
pkt->rpc_vers_minor = 0;
@@ -916,7 +916,7 @@ static int dcerpc_req_dequeue(struct rpc_request *req)
/*
mark the dcerpc connection dead. All outstanding requests get an error
*/
-static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS
status)
+static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS
status)
{
if (conn->dead) return;
@@ -947,7 +947,7 @@ static void dcerpc_connection_dead(struct dcerpc_connection
*conn, NTSTATUS stat
forward declarations of the recv_data handlers for the types of
packets we need to handle
*/
-static void dcerpc_request_recv_data(struct dcerpc_connection *c,
+static void dcerpc_request_recv_data(struct dcecli_connection *c,
DATA_BLOB *raw_packet, struct ncacn_packet
*pkt);
/*
@@ -955,7 +955,7 @@ static void dcerpc_request_recv_data(struct
dcerpc_connection *c,
type of reply it is (normal request, bind or alter context) and
dispatch to the appropriate handler
*/
-static void dcerpc_recv_data(struct dcerpc_connection *conn, DATA_BLOB *blob,
NTSTATUS status)
+static void dcerpc_recv_data(struct dcecli_connection *conn, DATA_BLOB *blob,
NTSTATUS status)
{
struct ncacn_packet pkt;
@@ -988,7 +988,7 @@ static void dcerpc_bind_recv_handler(struct rpc_request
*req,
DATA_BLOB *raw_packet, struct ncacn_packet
*pkt)
{
struct composite_context *c;
- struct dcerpc_connection *conn;
+ struct dcecli_connection *conn;
c = talloc_get_type(req->async.private_data, struct composite_context);
--
Samba Shared Repository
