summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-05-17 16:08:16 +0200
committerAndreas Schneider <asn@samba.org>2013-08-05 10:29:59 +0200
commitfa37bbd9d06865d265bf554a3c49920f956f2185 (patch)
treebc3f7d4e24b43162bcf833ef6148ba7dff4e2b68
parenta1368ca6ef8ab4f158c8b303ad058835f1bbf441 (diff)
downloadsamba-fa37bbd9d06865d265bf554a3c49920f956f2185.tar.gz
samba-fa37bbd9d06865d265bf554a3c49920f956f2185.tar.bz2
samba-fa37bbd9d06865d265bf554a3c49920f956f2185.zip
s3-libnetapi: pass down ndr_interface_table to libnetapi_get_binding_handle().
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r--source3/lib/netapi/cm.c4
-rw-r--r--source3/lib/netapi/file.c6
-rw-r--r--source3/lib/netapi/getdc.c6
-rw-r--r--source3/lib/netapi/netapi_private.h3
-rw-r--r--source3/lib/netapi/netlogon.c4
-rw-r--r--source3/lib/netapi/serverinfo.c6
-rw-r--r--source3/lib/netapi/share.c10
-rw-r--r--source3/lib/netapi/shutdown.c4
8 files changed, 22 insertions, 21 deletions
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 36e8731fa9..786fd94957 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -269,7 +269,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
const char *server_name,
- const struct ndr_syntax_id *interface,
+ const struct ndr_interface_table *table,
struct dcerpc_binding_handle **binding_handle)
{
struct rpc_pipe_client *pipe_cli;
@@ -277,7 +277,7 @@ WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
*binding_handle = NULL;
- result = libnetapi_open_pipe(ctx, server_name, interface, &pipe_cli);
+ result = libnetapi_open_pipe(ctx, server_name, &table->syntax_id, &pipe_cli);
if (!W_ERROR_IS_OK(result)) {
return result;
}
diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 1e406d2884..551f9ff4f0 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -36,7 +36,7 @@ WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -130,7 +130,7 @@ WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -201,7 +201,7 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 3b26d46db4..ae976f1f02 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -47,7 +47,7 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
void *buffer;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_netlogon.syntax_id,
+ &ndr_table_netlogon,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -101,7 +101,7 @@ WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx,
void *buffer;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_netlogon.syntax_id,
+ &ndr_table_netlogon,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -173,7 +173,7 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_netlogon.syntax_id,
+ &ndr_table_netlogon,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index 349287b9e9..62aa7ef55e 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -30,6 +30,7 @@
return fn ## _r(ctx, r);
struct dcerpc_binding_handle;
+struct ndr_interface_table;
struct libnetapi_private_ctx {
struct {
@@ -64,7 +65,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
struct rpc_pipe_client **presult);
WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
const char *server_name,
- const struct ndr_syntax_id *interface,
+ const struct ndr_interface_table *table,
struct dcerpc_binding_handle **binding_handle);
WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
struct rpc_pipe_client *pipe_cli,
diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index a046fb77e9..136cb48884 100644
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -133,7 +133,7 @@ WERROR I_NetLogonControl_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_netlogon.syntax_id,
+ &ndr_table_netlogon,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -190,7 +190,7 @@ WERROR I_NetLogonControl2_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_netlogon.syntax_id,
+ &ndr_table_netlogon,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 046b693f1f..b2a84d11a5 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -503,7 +503,7 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -616,7 +616,7 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -658,7 +658,7 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index d12fa1cf0c..090e1a9939 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -200,7 +200,7 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -258,7 +258,7 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -321,7 +321,7 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
ZERO_STRUCT(info_ctr);
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -428,7 +428,7 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -502,7 +502,7 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_srvsvc.syntax_id,
+ &ndr_table_srvsvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/lib/netapi/shutdown.c b/source3/lib/netapi/shutdown.c
index 78bc2fce6b..9e1e8e13cf 100644
--- a/source3/lib/netapi/shutdown.c
+++ b/source3/lib/netapi/shutdown.c
@@ -38,7 +38,7 @@ WERROR NetShutdownInit_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_initshutdown.syntax_id,
+ &ndr_table_initshutdown,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -82,7 +82,7 @@ WERROR NetShutdownAbort_r(struct libnetapi_ctx *ctx,
struct dcerpc_binding_handle *b;
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
- &ndr_table_initshutdown.syntax_id,
+ &ndr_table_initshutdown,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;