X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=librpc%2Fgen_ndr%2Fsrv_echo.c;h=b4c21dd27034e680fe33bc1850813d5823ec3520;hp=ac8a9a3f36e9c467300a2402c372032a756ff9e5;hb=6ed45442c4b7ea4e3b22aae3d574ca4149940dcc;hpb=82c35e460e00d6f9e61df2d20ea9d0ccf765636a

diff --git a/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index ac8a9a3f36e..b4c21dd2703 100644
--- a/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
@@ -15,7 +15,7 @@ static bool api_echo_AddOne(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_AddOne *r;
 
-	call = &p->interface->calls[NDR_ECHO_ADDONE];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_ADDONE];
 
 	r = talloc(talloc_tos(), struct echo_AddOne);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_echo_EchoData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_EchoData *r;
 
-	call = &p->interface->calls[NDR_ECHO_ECHODATA];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_ECHODATA];
 
 	r = talloc(talloc_tos(), struct echo_EchoData);
 	if (r == NULL) {
@@ -175,7 +175,7 @@ static bool api_echo_SinkData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_SinkData *r;
 
-	call = &p->interface->calls[NDR_ECHO_SINKDATA];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_SINKDATA];
 
 	r = talloc(talloc_tos(), struct echo_SinkData);
 	if (r == NULL) {
@@ -248,7 +248,7 @@ static bool api_echo_SourceData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_SourceData *r;
 
-	call = &p->interface->calls[NDR_ECHO_SOURCEDATA];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_SOURCEDATA];
 
 	r = talloc(talloc_tos(), struct echo_SourceData);
 	if (r == NULL) {
@@ -328,7 +328,7 @@ static bool api_echo_TestCall(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestCall *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTCALL];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL];
 
 	r = talloc(talloc_tos(), struct echo_TestCall);
 	if (r == NULL) {
@@ -408,7 +408,7 @@ static bool api_echo_TestCall2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestCall2 *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTCALL2];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL2];
 
 	r = talloc(talloc_tos(), struct echo_TestCall2);
 	if (r == NULL) {
@@ -488,7 +488,7 @@ static bool api_echo_TestSleep(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestSleep *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTSLEEP];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSLEEP];
 
 	r = talloc(talloc_tos(), struct echo_TestSleep);
 	if (r == NULL) {
@@ -561,7 +561,7 @@ static bool api_echo_TestEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestEnum *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTENUM];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTENUM];
 
 	r = talloc(talloc_tos(), struct echo_TestEnum);
 	if (r == NULL) {
@@ -638,7 +638,7 @@ static bool api_echo_TestSurrounding(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestSurrounding *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTSURROUNDING];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSURROUNDING];
 
 	r = talloc(talloc_tos(), struct echo_TestSurrounding);
 	if (r == NULL) {
@@ -713,7 +713,7 @@ static bool api_echo_TestDoublePointer(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestDoublePointer *r;
 
-	call = &p->interface->calls[NDR_ECHO_TESTDOUBLEPOINTER];
+	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTDOUBLEPOINTER];
 
 	r = talloc(talloc_tos(), struct echo_TestDoublePointer);
 	if (r == NULL) {
@@ -799,7 +799,7 @@ void rpcecho_get_pipe_fns(struct api_struct **fns, int *n_fns)
 	*n_fns = sizeof(api_rpcecho_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
+NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
 {
 	if (cli->pipes_struct == NULL) {
 		return NT_STATUS_INVALID_PARAMETER;
@@ -812,7 +812,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			ZERO_STRUCT(r->out);
 			r->out.out_data = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.out_data == NULL) {
-			return NT_STATUS_NO_MEMORY;
+				return NT_STATUS_NO_MEMORY;
 			}
 
 			_echo_AddOne(cli->pipes_struct, r);
@@ -824,7 +824,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			ZERO_STRUCT(r->out);
 			r->out.out_data = talloc_zero_array(mem_ctx, uint8_t, r->in.len);
 			if (r->out.out_data == NULL) {
-			return NT_STATUS_NO_MEMORY;
+				return NT_STATUS_NO_MEMORY;
 			}
 
 			_echo_EchoData(cli->pipes_struct, r);
@@ -842,7 +842,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			ZERO_STRUCT(r->out);
 			r->out.data = talloc_zero_array(mem_ctx, uint8_t, r->in.len);
 			if (r->out.data == NULL) {
-			return NT_STATUS_NO_MEMORY;
+				return NT_STATUS_NO_MEMORY;
 			}
 
 			_echo_SourceData(cli->pipes_struct, r);
@@ -854,7 +854,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			ZERO_STRUCT(r->out);
 			r->out.s2 = talloc_zero(mem_ctx, const char *);
 			if (r->out.s2 == NULL) {
-			return NT_STATUS_NO_MEMORY;
+				return NT_STATUS_NO_MEMORY;
 			}
 
 			_echo_TestCall(cli->pipes_struct, r);
@@ -866,7 +866,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union echo_Info);
 			if (r->out.info == NULL) {
-			return NT_STATUS_NO_MEMORY;
+				return NT_STATUS_NO_MEMORY;
 			}
 
 			r->out.result = _echo_TestCall2(cli->pipes_struct, r);