From 9813fe2b04a5b4abaa95ea1d893b3803edbede4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 24 May 2013 13:29:28 +0200 Subject: [PATCH] s3-rpc_cli: pass down ndr_interface_table to cli_rpc_pipe_open_noauth(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- source3/auth/auth_domain.c | 2 +- source3/client/client.c | 2 +- source3/lib/netapi/cm.c | 2 +- source3/libnet/libnet_join.c | 8 ++++---- source3/libsmb/libsmb_dir.c | 2 +- source3/libsmb/libsmb_server.c | 2 +- source3/libsmb/passchange.c | 4 ++-- source3/libsmb/trustdom_cache.c | 2 +- source3/libsmb/trusts_util.c | 2 +- source3/rpc_client/cli_pipe.c | 4 ++-- source3/rpc_client/cli_pipe.h | 2 +- source3/rpc_client/cli_pipe_schannel.c | 2 +- source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +- source3/rpcclient/cmd_spoolss.c | 2 +- source3/rpcclient/cmd_test.c | 4 ++-- source3/rpcclient/rpcclient.c | 2 +- source3/torture/test_async_echo.c | 2 +- source3/utils/net_ads.c | 2 +- source3/utils/net_rpc.c | 20 ++++++++++---------- source3/utils/net_rpc_join.c | 6 +++--- source3/utils/net_rpc_shell.c | 2 +- source3/utils/net_rpc_trust.c | 2 +- source3/utils/net_util.c | 8 ++++---- source3/utils/netlookup.c | 2 +- source3/utils/smbcacls.c | 7 +++---- source3/utils/smbcquotas.c | 2 +- source3/utils/smbtree.c | 2 +- source3/winbindd/winbindd_cm.c | 10 +++++----- 28 files changed, 54 insertions(+), 55 deletions(-) diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index a375f113547..54ee5a17df7 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -119,7 +119,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli, DCERPC_AUTH_LEVEL_PRIVACY, domain, &netlogon_pipe); } else { result = cli_rpc_pipe_open_noauth( - *cli, &ndr_table_netlogon.syntax_id, &netlogon_pipe); + *cli, &ndr_table_netlogon, &netlogon_pipe); } if (!NT_STATUS_IS_OK(result)) { diff --git a/source3/client/client.c b/source3/client/client.c index d03d1a40aed..1f630526510 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -4218,7 +4218,7 @@ static bool browse_host_rpc(bool sort) int i; struct dcerpc_binding_handle *b; - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index c158792e00f..cbc93d9784b 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -202,7 +202,7 @@ static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx, return NT_STATUS_NO_MEMORY; } - status = cli_rpc_pipe_open_noauth(ipc->cli, &table->syntax_id, &p->pipe); + status = cli_rpc_pipe_open_noauth(ipc->cli, table, &p->pipe); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(p); return status; diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index c77149a33b0..348fb94bc50 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -734,7 +734,7 @@ static NTSTATUS libnet_join_lookup_dc_rpc(TALLOC_CTX *mem_ctx, goto done; } - status = cli_rpc_pipe_open_noauth(*cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(*cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Error connecting to LSA pipe. Error was %s\n", @@ -804,7 +804,7 @@ static NTSTATUS libnet_join_joindomain_rpc_unsecure(TALLOC_CTX *mem_ctx, fstring trust_passwd; NTSTATUS status; - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { return status; @@ -893,7 +893,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, /* Open the domain */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Error connecting to SAM pipe. Error was %s\n", @@ -1354,7 +1354,7 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx, /* Open the domain */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Error connecting to SAM pipe. Error was %s\n", diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 87e10d8abcf..3a07f118b0c 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -277,7 +277,7 @@ net_share_enum_rpc(struct cli_state *cli, struct dcerpc_binding_handle *b; /* Open the server service pipe */ - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(1, ("net_share_enum_rpc pipe open fail!\n")); diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index fc3977edbae..5c665bfbd18 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -792,7 +792,7 @@ SMBC_attr_server(TALLOC_CTX *ctx, ipc_srv->cli = ipc_cli; nt_status = cli_rpc_pipe_open_noauth( - ipc_srv->cli, &ndr_table_lsarpc.syntax_id, &pipe_hnd); + ipc_srv->cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(1, ("cli_nt_session_open fail!\n")); errno = ENOTSUP; diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index 393383336bf..9736adab9f6 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -169,7 +169,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam * way. */ result = cli_rpc_pipe_open_noauth( - cli, &ndr_table_samr.syntax_id, &pipe_hnd); + cli, &ndr_table_samr, &pipe_hnd); } if (!NT_STATUS_IS_OK(result)) { @@ -230,7 +230,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam result = NT_STATUS_UNSUCCESSFUL; /* OK, this is ugly, but... try an anonymous pipe. */ - result = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr, &pipe_hnd); if ( NT_STATUS_IS_OK(result) && diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c index 8789d303384..dadc7518fde 100644 --- a/source3/libsmb/trustdom_cache.c +++ b/source3/libsmb/trustdom_cache.c @@ -289,7 +289,7 @@ static bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain, /* open the LSARPC_PIPE */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &lsa_pipe); if (!NT_STATUS_IS_OK(status)) { goto done; diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c index 0d039bc812e..6156ba0756c 100644 --- a/source3/libsmb/trusts_util.c +++ b/source3/libsmb/trusts_util.c @@ -182,7 +182,7 @@ NTSTATUS change_trust_account_password( const char *domain, const char *remote_m /* Shouldn't we open this with schannel ? JRA. */ nt_status = cli_rpc_pipe_open_noauth( - cli, &ndr_table_netlogon.syntax_id, &netlogon_pipe); + cli, &ndr_table_netlogon, &netlogon_pipe); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0,("modify_trust_password: unable to open the domain client session to machine %s. Error was : %s.\n", dc_name, nt_errstr(nt_status))); diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 8ff4a861e15..a8fbaa2bca6 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2920,11 +2920,11 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli, ****************************************************************************/ NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli, - const struct ndr_syntax_id *interface, + const struct ndr_interface_table *table, struct rpc_pipe_client **presult) { return cli_rpc_pipe_open_noauth_transport(cli, NCACN_NP, - interface, presult); + &table->syntax_id, presult); } /**************************************************************************** diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h index 65bfbc869db..9aae61a9d29 100644 --- a/source3/rpc_client/cli_pipe.h +++ b/source3/rpc_client/cli_pipe.h @@ -77,7 +77,7 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path, struct dcerpc_binding_handle *rpccli_bh_create(struct rpc_pipe_client *c); NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli, - const struct ndr_syntax_id *interface, + const struct ndr_interface_table *table, struct rpc_pipe_client **presult); NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli, diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c index 784e63f56de..bc672efe955 100644 --- a/source3/rpc_client/cli_pipe_schannel.c +++ b/source3/rpc_client/cli_pipe_schannel.c @@ -217,7 +217,7 @@ NTSTATUS get_schannel_session_key(struct cli_state *cli, struct rpc_pipe_client *netlogon_pipe = NULL; NTSTATUS status; - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon, &netlogon_pipe); if (!NT_STATUS_IS_OK(status)) { return status; diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 03c966b615e..a094b4945a4 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -2493,7 +2493,7 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, * Now start the NT Domain stuff :-). */ - ret = cli_rpc_pipe_open_noauth(the_cli, &ndr_table_spoolss.syntax_id, pp_pipe); + ret = cli_rpc_pipe_open_noauth(the_cli, &ndr_table_spoolss, pp_pipe); if (!NT_STATUS_IS_OK(ret)) { DEBUG(2,("spoolss_connect_to_client: unable to open the spoolss pipe on machine %s. Error was : %s.\n", remote_machine, nt_errstr(ret))); diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 5c499d46383..fb011f8478d 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -3453,7 +3453,7 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli, if ( !NT_STATUS_IS_OK(nt_status) ) return WERR_GENERAL_FAILURE; - nt_status = cli_rpc_pipe_open_noauth(cli_server2, &ndr_table_spoolss.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli_server2, &ndr_table_spoolss, &cli2); if (!NT_STATUS_IS_OK(nt_status)) { printf("failed to open spoolss pipe on server %s (%s)\n", diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c index 591ae8cf3f5..367dc713baf 100644 --- a/source3/rpcclient/cmd_test.c +++ b/source3/rpcclient/cmd_test.c @@ -36,14 +36,14 @@ static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, d_printf("testme\n"); status = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(cli), - &ndr_table_lsarpc.syntax_id, + &ndr_table_lsarpc, &lsa_pipe); if (!NT_STATUS_IS_OK(status)) { goto done; } status = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(cli), - &ndr_table_samr.syntax_id, + &ndr_table_samr, &samr_pipe); if (!NT_STATUS_IS_OK(status)) { goto done; diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 6b6478e4fc0..e3b35bbc15b 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -167,7 +167,7 @@ static void fetch_machine_sid(struct cli_state *cli) goto error; } - result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &lsapipe); if (!NT_STATUS_IS_OK(result)) { fprintf(stderr, "could not initialise lsa pipe. Error was %s\n", nt_errstr(result) ); diff --git a/source3/torture/test_async_echo.c b/source3/torture/test_async_echo.c index 6df95dd51e8..f21daa4485c 100644 --- a/source3/torture/test_async_echo.c +++ b/source3/torture/test_async_echo.c @@ -82,7 +82,7 @@ bool run_async_echo(int dummy) printf("torture_open_connection failed\n"); goto fail; } - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_rpcecho.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_rpcecho, &p); if (!NT_STATUS_IS_OK(status)) { printf("Could not open echo pipe: %s\n", nt_errstr(status)); diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 569994362d9..89eebf3388d 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1957,7 +1957,7 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char * SAFE_FREE(srv_cn_escaped); SAFE_FREE(printername_escaped); - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss.syntax_id, &pipe_hnd); + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { d_fprintf(stderr, _("Unable to open a connection to the spoolss pipe on %s\n"), servername); diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 1e9d6f0f301..488167cb397 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -82,7 +82,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, union lsa_PolicyInformation *info = NULL; struct dcerpc_binding_handle *b; - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &lsa_pipe); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("Could not initialise lsa pipe\n")); @@ -212,7 +212,7 @@ int run_rpc_command(struct net_context *c, c->opt_password, &pipe_hnd); } else { nt_status = cli_rpc_pipe_open_noauth( - cli, &table->syntax_id, + cli, table, &pipe_hnd); } if (!NT_STATUS_IS_OK(nt_status)) { @@ -348,7 +348,7 @@ static NTSTATUS rpc_oldjoin_internals(struct net_context *c, NTSTATUS result; enum netr_SchannelType sec_channel_type; - result = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id, + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon, &pipe_hnd); if (!NT_STATUS_IS_OK(result)) { DEBUG(0,("rpc_oldjoin_internals: netlogon pipe open to machine %s failed. " @@ -1958,7 +1958,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli, NTSTATUS status, result; struct dcerpc_binding_handle *b; - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { goto done; @@ -2951,7 +2951,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c, } result = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(pipe_hnd), - &ndr_table_lsarpc.syntax_id, + &ndr_table_lsarpc, &lsa_pipe); if (!NT_STATUS_IS_OK(result)) { d_fprintf(stderr, _("Couldn't open LSA pipe. Error was %s\n"), @@ -6188,7 +6188,7 @@ static NTSTATUS rpc_trustdom_get_pdc(struct net_context *c, /* Try netr_GetDcName */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon, &netr); if (!NT_STATUS_IS_OK(status)) { return status; @@ -6335,7 +6335,7 @@ static int rpc_trustdom_establish(struct net_context *c, int argc, * Call LsaOpenPolicy and LsaQueryInfo */ - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) )); @@ -6612,7 +6612,7 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc, return -1; }; - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", @@ -6790,7 +6790,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv) return -1; }; - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", @@ -6906,7 +6906,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv) /* * Open \PIPE\samr and get needed policy handles */ - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Could not initialise samr pipe. Error was %s\n", nt_errstr(nt_status))); diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index c5366760bc2..a6ef11b254a 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -245,7 +245,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) /* Fetch domain sid */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Error connecting to LSA pipe. Error was %s\n", @@ -280,7 +280,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) } /* Create domain user */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Error connecting to SAM pipe. Error was %s\n", @@ -447,7 +447,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) /* Now check the whole process from top-to-bottom */ - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Error connecting to NETLOGON pipe. Error was %s\n", diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c index 60860663c67..120cfa6af95 100644 --- a/source3/utils/net_rpc_shell.c +++ b/source3/utils/net_rpc_shell.c @@ -85,7 +85,7 @@ static NTSTATUS net_sh_run(struct net_context *c, return NT_STATUS_NO_MEMORY; } - status = cli_rpc_pipe_open_noauth(ctx->cli, &cmd->table->syntax_id, + status = cli_rpc_pipe_open_noauth(ctx->cli, cmd->table, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("Could not open pipe: %s\n"), diff --git a/source3/utils/net_rpc_trust.c b/source3/utils/net_rpc_trust.c index 9060700be1d..5e58103fb03 100644 --- a/source3/utils/net_rpc_trust.c +++ b/source3/utils/net_rpc_trust.c @@ -210,7 +210,7 @@ static NTSTATUS connect_and_get_info(TALLOC_CTX *mem_ctx, return status; } - status = cli_rpc_pipe_open_noauth(*cli, &ndr_table_lsarpc.syntax_id, pipe_hnd); + status = cli_rpc_pipe_open_noauth(*cli, &ndr_table_lsarpc, pipe_hnd); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Failed to initialise lsa pipe with error [%s]\n", nt_errstr(status))); diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index a4282ec4217..13a0ef12d86 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -45,7 +45,7 @@ NTSTATUS net_rpc_lookup_name(struct net_context *c, ZERO_STRUCT(pol); - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &lsa_pipe); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("Could not initialise lsa pipe\n")); @@ -256,7 +256,7 @@ NTSTATUS connect_dst_pipe(struct net_context *c, struct cli_state **cli_dst, return nt_status; } - nt_status = cli_rpc_pipe_open_noauth(cli_tmp, &table->syntax_id, + nt_status = cli_rpc_pipe_open_noauth(cli_tmp, table, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("couldn't not initialize pipe\n")); @@ -571,7 +571,7 @@ static NTSTATUS net_scan_dc_noad(struct net_context *c, ZERO_STRUCTP(dc_info); ZERO_STRUCT(pol); - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { return status; @@ -634,7 +634,7 @@ NTSTATUS net_scan_dc(struct net_context *c, ZERO_STRUCTP(dc_info); - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_dssetup.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_dssetup, &dssetup_pipe); if (!NT_STATUS_IS_OK(status)) { DEBUG(10,("net_scan_dc: failed to open dssetup pipe with %s, " diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index b66c34e61dc..56d3bfe42dc 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -122,7 +122,7 @@ static struct con_struct *create_cs(struct net_context *c, } nt_status = cli_rpc_pipe_open_noauth(cs->cli, - &ndr_table_lsarpc.syntax_id, + &ndr_table_lsarpc, &cs->lsapipe); if (!NT_STATUS_IS_OK(nt_status)) { diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 39400c8bdd7..d3d60bc8eaf 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -96,7 +96,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli, goto tcon_fail; } - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &p); if (!NT_STATUS_IS_OK(status)) { goto fail; @@ -146,7 +146,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli, goto tcon_fail; } - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &p); if (!NT_STATUS_IS_OK(status)) { goto fail; @@ -187,14 +187,13 @@ static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli, struct policy_handle handle; NTSTATUS status, result; TALLOC_CTX *frame = talloc_stackframe(); - const struct ndr_syntax_id *lsarpc_syntax = &ndr_table_lsarpc.syntax_id; status = cli_tree_connect(cli, "IPC$", "?????", "", 0); if (!NT_STATUS_IS_OK(status)) { goto done; } - status = cli_rpc_pipe_open_noauth(cli, lsarpc_syntax, &rpc_pipe); + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &rpc_pipe); if (!NT_STATUS_IS_OK(status)) { goto tdis; } diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index bf1f95c25f8..2791b93424f 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -58,7 +58,7 @@ static bool cli_open_policy_hnd(void) NTSTATUS ret; cli_ipc = connect_one("IPC$"); ret = cli_rpc_pipe_open_noauth(cli_ipc, - &ndr_table_lsarpc.syntax_id, + &ndr_table_lsarpc, &global_pipe_hnd); if (!NT_STATUS_IS_OK(ret)) { return False; diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c index 40b1f096ad9..5c07b122b27 100644 --- a/source3/utils/smbtree.c +++ b/source3/utils/smbtree.c @@ -177,7 +177,7 @@ static bool get_rpc_shares(struct cli_state *cli, return False; } - status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, + status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index dfcf3f4bd4d..6c3f6eadf27 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2006,7 +2006,7 @@ static void set_dc_type_and_flags_connect( struct winbindd_domain *domain ) DEBUG(5, ("set_dc_type_and_flags_connect: domain %s\n", domain->name )); status = cli_rpc_pipe_open_noauth(domain->conn.cli, - &ndr_table_dssetup.syntax_id, + &ndr_table_dssetup, &cli); if (!NT_STATUS_IS_OK(status)) { @@ -2057,7 +2057,7 @@ static void set_dc_type_and_flags_connect( struct winbindd_domain *domain ) no_dssetup: status = cli_rpc_pipe_open_noauth(domain->conn.cli, - &ndr_table_lsarpc.syntax_id, &cli); + &ndr_table_lsarpc, &cli); if (!NT_STATUS_IS_OK(status)) { DEBUG(5, ("set_dc_type_and_flags_connect: Could not bind to " @@ -2375,7 +2375,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, anonymous: /* Finally fall back to anonymous. */ - status = cli_rpc_pipe_open_noauth(conn->cli, &ndr_table_samr.syntax_id, + status = cli_rpc_pipe_open_noauth(conn->cli, &ndr_table_samr, &conn->samr_pipe); if (!NT_STATUS_IS_OK(status)) { @@ -2602,7 +2602,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, anonymous: result = cli_rpc_pipe_open_noauth(conn->cli, - &ndr_table_lsarpc.syntax_id, + &ndr_table_lsarpc, &conn->lsa_pipe); if (!NT_STATUS_IS_OK(result)) { result = NT_STATUS_PIPE_NOT_AVAILABLE; @@ -2688,7 +2688,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, TALLOC_FREE(conn->netlogon_pipe); result = cli_rpc_pipe_open_noauth(conn->cli, - &ndr_table_netlogon.syntax_id, + &ndr_table_netlogon, &netlogon_pipe); if (!NT_STATUS_IS_OK(result)) { return result; -- 2.34.1