diff options
| -rw-r--r-- | source3/utils/net.h | 2 | ||||
| -rw-r--r-- | source3/utils/net_dom.c | 12 | ||||
| -rw-r--r-- | source3/utils/net_printing.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_proto.h | 2 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 137 | ||||
| -rw-r--r-- | source3/utils/net_rpc_audit.c | 10 | ||||
| -rw-r--r-- | source3/utils/net_rpc_conf.c | 26 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 22 | ||||
| -rw-r--r-- | source3/utils/net_rpc_rights.c | 12 | ||||
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 14 | ||||
| -rw-r--r-- | source3/utils/net_rpc_service.c | 16 | ||||
| -rw-r--r-- | source3/utils/net_rpc_sh_acct.c | 16 | ||||
| -rw-r--r-- | source3/utils/net_rpc_shell.c | 4 |
13 files changed, 137 insertions, 138 deletions
diff --git a/source3/utils/net.h b/source3/utils/net.h index 2dc443082c..5b9db10bad 100644 --- a/source3/utils/net.h +++ b/source3/utils/net.h @@ -152,7 +152,7 @@ struct rpc_sh_cmd { struct rpc_sh_cmd *(*sub)(struct net_context *c, TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx); - const struct ndr_syntax_id *interface; + const struct ndr_interface_table *table; NTSTATUS (*fn)(struct net_context *c, TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx, struct rpc_pipe_client *pipe_hnd, diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c index 2b67b7b2fe..b2f02a4f4f 100644 --- a/source3/utils/net_dom.c +++ b/source3/utils/net_dom.c @@ -111,14 +111,14 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv) c->opt_timeout = 30; ret = run_rpc_command(c, cli, - &ndr_table_initshutdown.syntax_id, + &ndr_table_initshutdown, 0, rpc_init_shutdown_internals, argc, argv); if (ret == 0) { goto done; } - ret = run_rpc_command(c, cli, &ndr_table_winreg.syntax_id, 0, + ret = run_rpc_command(c, cli, &ndr_table_winreg, 0, rpc_reg_shutdown_internals, argc, argv); goto done; @@ -217,14 +217,14 @@ static int net_dom_join(struct net_context *c, int argc, const char **argv) c->opt_reboot = true; c->opt_timeout = 30; - ret = run_rpc_command(c, cli, &ndr_table_initshutdown.syntax_id, 0, + ret = run_rpc_command(c, cli, &ndr_table_initshutdown, 0, rpc_init_shutdown_internals, argc, argv); if (ret == 0) { goto done; } - ret = run_rpc_command(c, cli, &ndr_table_winreg.syntax_id, 0, + ret = run_rpc_command(c, cli, &ndr_table_winreg, 0, rpc_reg_shutdown_internals, argc, argv); goto done; @@ -314,14 +314,14 @@ static int net_dom_renamecomputer(struct net_context *c, int argc, const char ** c->opt_timeout = 30; ret = run_rpc_command(c, cli, - &ndr_table_initshutdown.syntax_id, + &ndr_table_initshutdown, 0, rpc_init_shutdown_internals, argc, argv); if (ret == 0) { goto done; } - ret = run_rpc_command(c, cli, &ndr_table_winreg.syntax_id, 0, + ret = run_rpc_command(c, cli, &ndr_table_winreg, 0, rpc_reg_shutdown_internals, argc, argv); goto done; diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index fd33ede152..870f0c3ec3 100644 --- a/source3/utils/net_printing.c +++ b/source3/utils/net_printing.c @@ -331,7 +331,7 @@ static int net_printing_migrate(struct net_context *c, return run_rpc_command(c, NULL, - &ndr_table_winreg.syntax_id, + &ndr_table_winreg, 0, printing_migrate_internal, argc, diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index c25294b174..83633aa7fc 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -139,7 +139,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, const char **domain_name); int run_rpc_command(struct net_context *c, struct cli_state *cli_arg, - const struct ndr_syntax_id *interface, + const struct ndr_interface_table *table, int conn_flags, rpc_command_fn fn, int argc, diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 5491c58138..fa3a49fe37 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -141,7 +141,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, int run_rpc_command(struct net_context *c, struct cli_state *cli_arg, - const struct ndr_syntax_id *interface, + const struct ndr_interface_table *table, int conn_flags, rpc_command_fn fn, int argc, @@ -186,11 +186,11 @@ int run_rpc_command(struct net_context *c, if (!(conn_flags & NET_FLAGS_NO_PIPE)) { if (lp_client_schannel() - && (ndr_syntax_id_equal(interface, + && (ndr_syntax_id_equal(&table->syntax_id, &ndr_table_netlogon.syntax_id))) { /* Always try and create an schannel netlogon pipe. */ nt_status = cli_rpc_pipe_open_schannel( - cli, interface, NCACN_NP, + cli, &table->syntax_id, NCACN_NP, DCERPC_AUTH_LEVEL_PRIVACY, domain_name, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { @@ -201,7 +201,7 @@ int run_rpc_command(struct net_context *c, } else { if (conn_flags & NET_FLAGS_SEAL) { nt_status = cli_rpc_pipe_open_generic_auth( - cli, interface, + cli, &table->syntax_id, (conn_flags & NET_FLAGS_TCP) ? NCACN_IP_TCP : NCACN_NP, DCERPC_AUTH_TYPE_NTLMSSP, @@ -211,13 +211,12 @@ int run_rpc_command(struct net_context *c, c->opt_password, &pipe_hnd); } else { nt_status = cli_rpc_pipe_open_noauth( - cli, interface, + cli, &table->syntax_id, &pipe_hnd); } if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Could not initialise pipe %s. Error was %s\n", - get_pipe_name_from_syntax( - talloc_tos(), interface), + table->name, nt_errstr(nt_status) )); goto fail; } @@ -307,7 +306,7 @@ int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id, + return run_rpc_command(c, NULL, &ndr_table_netlogon, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, rpc_changetrustpw_internals, argc, argv); @@ -409,7 +408,7 @@ static NTSTATUS rpc_oldjoin_internals(struct net_context *c, static int net_rpc_perform_oldjoin(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id, + return run_rpc_command(c, NULL, &ndr_table_netlogon, NET_FLAGS_NO_PIPE | NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, rpc_oldjoin_internals, argc, argv); @@ -609,7 +608,7 @@ int net_rpc_info(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, + return run_rpc_command(c, NULL, &ndr_table_samr, NET_FLAGS_PDC, rpc_info_internals, argc, argv); } @@ -677,7 +676,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, + return run_rpc_command(c, NULL, &ndr_table_samr, conn_flags, rpc_getsid_internals, argc, argv); @@ -1488,34 +1487,34 @@ struct rpc_sh_cmd *net_rpc_user_edit_cmds(struct net_context *c, { static struct rpc_sh_cmd cmds[] = { - { "fullname", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "fullname", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's full name") }, - { "homedir", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "homedir", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's home directory") }, - { "homedrive", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "homedrive", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's home drive") }, - { "logonscript", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "logonscript", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's logon script") }, - { "profilepath", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "profilepath", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's profile path") }, - { "description", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit, + { "description", NULL, &ndr_table_samr, rpc_sh_user_str_edit, N_("Show/Set a user's description") }, - { "disabled", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit, + { "disabled", NULL, &ndr_table_samr, rpc_sh_user_flag_edit, N_("Show/Set whether a user is disabled") }, - { "autolock", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit, + { "autolock", NULL, &ndr_table_samr, rpc_sh_user_flag_edit, N_("Show/Set whether a user locked out") }, - { "pwnotreq", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit, + { "pwnotreq", NULL, &ndr_table_samr, rpc_sh_user_flag_edit, N_("Show/Set whether a user does not need a password") }, - { "pwnoexp", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit, + { "pwnoexp", NULL, &ndr_table_samr, rpc_sh_user_flag_edit, N_("Show/Set whether a user's password does not expire") }, { NULL, NULL, 0, NULL, NULL } @@ -1530,13 +1529,13 @@ struct rpc_sh_cmd *net_rpc_user_cmds(struct net_context *c, { static struct rpc_sh_cmd cmds[] = { - { "list", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_list, + { "list", NULL, &ndr_table_samr, rpc_sh_user_list, N_("List available users") }, - { "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_info, + { "info", NULL, &ndr_table_samr, rpc_sh_user_info, N_("List the domain groups a user is member of") }, - { "show", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_show, + { "show", NULL, &ndr_table_samr, rpc_sh_user_show, N_("Show info about a user") }, { "edit", net_rpc_user_edit_cmds, 0, NULL, @@ -1858,7 +1857,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c, static int rpc_group_delete(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_delete_internals, argc,argv); } @@ -2244,7 +2243,7 @@ static NTSTATUS rpc_group_addmem_internals(struct net_context *c, static int rpc_group_addmem(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_addmem_internals, argc, argv); } @@ -2497,7 +2496,7 @@ static NTSTATUS rpc_group_delmem_internals(struct net_context *c, static int rpc_group_delmem(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_delmem_internals, argc, argv); } @@ -2796,7 +2795,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c, static int rpc_group_list(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_list_internals, argc, argv); } @@ -3126,7 +3125,7 @@ static int rpc_group_members(struct net_context *c, int argc, const char **argv) return rpc_group_usage(c, argc, argv); } - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_members_internals, argc, argv); } @@ -3261,7 +3260,7 @@ int net_rpc_group(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_group_list_internals, argc, argv); } @@ -3699,7 +3698,7 @@ static int rpc_share_migrate_shares(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_shares_internals, argc, argv); } @@ -4043,7 +4042,7 @@ static int rpc_share_migrate_files(struct net_context *c, int argc, const char * return -1; } - return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_files_internals, argc, argv); } @@ -4178,7 +4177,7 @@ static int rpc_share_migrate_security(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_security_internals, argc, argv); } @@ -4216,17 +4215,17 @@ static int rpc_share_migrate_all(struct net_context *c, int argc, /* order is important. we don't want to be locked out by the share-acl * before copying files - gd */ - ret = run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_shares_internals, argc, argv); if (ret) return ret; - ret = run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_files_internals, argc, argv); if (ret) return ret; - return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_migrate_security_internals, argc, argv); } @@ -5034,19 +5033,19 @@ static int rpc_share_allowedusers(struct net_context *c, int argc, return 0; } - result = run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + result = run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_aliaslist_internals, argc, argv); if (result != 0) return result; - result = run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + result = run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_aliaslist_dump, argc, argv); if (result != 0) return result; - return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_srvsvc, 0, rpc_share_allowedusers_internals, argc, argv); } @@ -5270,16 +5269,16 @@ struct rpc_sh_cmd *net_rpc_share_cmds(struct net_context *c, TALLOC_CTX *mem_ctx { static struct rpc_sh_cmd cmds[] = { - { "list", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_list, + { "list", NULL, &ndr_table_srvsvc, rpc_sh_share_list, N_("List available shares") }, - { "add", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_add, + { "add", NULL, &ndr_table_srvsvc, rpc_sh_share_add, N_("Add a share") }, - { "delete", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_delete, + { "delete", NULL, &ndr_table_srvsvc, rpc_sh_share_delete, N_("Delete a share") }, - { "info", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_info, + { "info", NULL, &ndr_table_srvsvc, rpc_sh_share_info, N_("Get information about a share") }, { NULL, NULL, 0, NULL, NULL } @@ -5560,7 +5559,7 @@ static int rpc_shutdown_abort(struct net_context *c, int argc, return 0; } - rc = run_rpc_command(c, NULL, &ndr_table_initshutdown.syntax_id, 0, + rc = run_rpc_command(c, NULL, &ndr_table_initshutdown, 0, rpc_shutdown_abort_internals, argc, argv); if (rc == 0) @@ -5568,7 +5567,7 @@ static int rpc_shutdown_abort(struct net_context *c, int argc, DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n")); - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_reg_shutdown_abort_internals, argc, argv); } @@ -5718,12 +5717,12 @@ static int rpc_shutdown(struct net_context *c, int argc, const char **argv) return 0; } - rc = run_rpc_command(c, NULL, &ndr_table_initshutdown.syntax_id, 0, + rc = run_rpc_command(c, NULL, &ndr_table_initshutdown, 0, rpc_init_shutdown_internals, argc, argv); if (rc) { DEBUG(1, ("initshutdown pipe failed, trying winreg pipe\n")); - rc = run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + rc = run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_reg_shutdown_internals, argc, argv); } @@ -5903,7 +5902,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c, static int rpc_trustdom_add(struct net_context *c, int argc, const char **argv) { if (argc > 0 && !c->display_usage) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_trustdom_add_internals, argc, argv); } else { d_printf("%s\n%s", @@ -6106,7 +6105,7 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c, static int rpc_trustdom_del(struct net_context *c, int argc, const char **argv) { if (argc > 0 && !c->display_usage) { - return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_samr, 0, rpc_trustdom_del_internals, argc, argv); } else { d_printf("%s\n%s", @@ -6970,7 +6969,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv) /* query for domain's sid */ if (run_rpc_command( c, remote_cli, - &ndr_table_lsarpc.syntax_id, 0, + &ndr_table_lsarpc, 0, rpc_query_domain_sid, argc, argv)) d_printf(_("strange - couldn't get domain's sid\n")); @@ -7122,7 +7121,7 @@ static int rpc_samdump(struct net_context *c, int argc, const char **argv) { return 0; } - return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id, + return run_rpc_command(c, NULL, &ndr_table_netlogon, NET_FLAGS_ANONYMOUS, rpc_samdump_internals, argc, argv); } @@ -7211,30 +7210,30 @@ static int rpc_printer_migrate_all(struct net_context *c, int argc, return -1; } - ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_printers_internals, argc, argv); if (ret) return ret; - ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_drivers_internals, argc, argv); if (ret) return ret; - ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_forms_internals, argc, argv); if (ret) return ret; - ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + ret = run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_settings_internals, argc, argv); if (ret) return ret; - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_security_internals, argc, argv); @@ -7267,7 +7266,7 @@ static int rpc_printer_migrate_drivers(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_drivers_internals, argc, argv); } @@ -7299,7 +7298,7 @@ static int rpc_printer_migrate_forms(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_forms_internals, argc, argv); } @@ -7331,7 +7330,7 @@ static int rpc_printer_migrate_printers(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_printers_internals, argc, argv); } @@ -7363,7 +7362,7 @@ static int rpc_printer_migrate_security(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_security_internals, argc, argv); } @@ -7396,7 +7395,7 @@ static int rpc_printer_migrate_settings(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_migrate_settings_internals, argc, argv); } @@ -7494,7 +7493,7 @@ static int rpc_printer_list(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_list_internals, argc, argv); } @@ -7521,7 +7520,7 @@ static int rpc_printer_driver_list(struct net_context *c, int argc, return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_driver_list_internals, argc, argv); } @@ -7548,7 +7547,7 @@ static int rpc_printer_publish_publish(struct net_context *c, int argc, return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_publish_publish_internals, argc, argv); } @@ -7574,7 +7573,7 @@ static int rpc_printer_publish_update(struct net_context *c, int argc, const cha return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_publish_update_internals, argc, argv); } @@ -7601,7 +7600,7 @@ static int rpc_printer_publish_unpublish(struct net_context *c, int argc, return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_publish_unpublish_internals, argc, argv); } @@ -7628,7 +7627,7 @@ static int rpc_printer_publish_list(struct net_context *c, int argc, return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_publish_list_internals, argc, argv); } @@ -7694,7 +7693,7 @@ static int rpc_printer_publish(struct net_context *c, int argc, net_display_usage_from_functable(func); return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_publish_list_internals, argc, argv); } @@ -7797,7 +7796,7 @@ int net_rpc_printer(struct net_context *c, int argc, const char **argv) net_display_usage_from_functable(func); return 0; } - return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_spoolss, 0, rpc_printer_list_internals, argc, argv); } diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c index 8179b70d53..336f6a857d 100644 --- a/source3/utils/net_rpc_audit.c +++ b/source3/utils/net_rpc_audit.c @@ -411,7 +411,7 @@ static int rpc_audit_get(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_audit_get_internal, argc, argv); } @@ -429,7 +429,7 @@ static int rpc_audit_set(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_audit_set_internal, argc, argv); } @@ -447,7 +447,7 @@ static int rpc_audit_enable(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_audit_enable_internal, argc, argv); } @@ -465,7 +465,7 @@ static int rpc_audit_disable(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_audit_disable_internal, argc, argv); } @@ -483,7 +483,7 @@ static int rpc_audit_list(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_audit_list_internal, argc, argv); } diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c index 68d5df2edf..3e13b12bd8 100644 --- a/source3/utils/net_rpc_conf.c +++ b/source3/utils/net_rpc_conf.c @@ -2269,7 +2269,7 @@ error: static int rpc_conf_drop(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_drop_internal, argc, argv ); } @@ -2277,82 +2277,82 @@ static int rpc_conf_drop(struct net_context *c, int argc, static int rpc_conf_showshare(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_showshare_internal, argc, argv ); } static int rpc_conf_addshare(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_addshare_internal, argc, argv ); } static int rpc_conf_listshares(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_listshares_internal, argc, argv ); } static int rpc_conf_list(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_list_internal, argc, argv ); } static int rpc_conf_import(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_import_internal, argc, argv ); } static int rpc_conf_delshare(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_delshare_internal, argc, argv ); } static int rpc_conf_getparm(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_getparm_internal, argc, argv ); } static int rpc_conf_setparm(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_setparm_internal, argc, argv ); } static int rpc_conf_delparm(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_delparm_internal, argc, argv ); } static int rpc_conf_getincludes(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_getincludes_internal, argc, argv ); } static int rpc_conf_setincludes(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_setincludes_internal, argc, argv ); } static int rpc_conf_delincludes(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_conf_delincludes_internal, argc, argv ); } diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index a6f118f2eb..9445e09c7d 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -647,7 +647,7 @@ static int rpc_registry_setvalue(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_setvalue_internal, argc, argv ); } @@ -707,7 +707,7 @@ static int rpc_registry_deletevalue(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_deletevalue_internal, argc, argv ); } @@ -835,7 +835,7 @@ static int rpc_registry_getvalue(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_getvalue_full, argc, argv); } @@ -863,7 +863,7 @@ static int rpc_registry_getvalueraw(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_getvalue_raw, argc, argv); } @@ -949,7 +949,7 @@ static int rpc_registry_createkey(struct net_context *c, int argc, return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_createkey_internal, argc, argv ); } @@ -1015,7 +1015,7 @@ static int rpc_registry_deletekey(struct net_context *c, int argc, const char ** return -1; } - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_deletekey_internal, argc, argv ); } @@ -1095,7 +1095,7 @@ static NTSTATUS rpc_registry_enumerate_internal(struct net_context *c, static int rpc_registry_enumerate(struct net_context *c, int argc, const char **argv ) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_enumerate_internal, argc, argv ); } @@ -1157,7 +1157,7 @@ static NTSTATUS rpc_registry_save_internal(struct net_context *c, static int rpc_registry_save(struct net_context *c, int argc, const char **argv ) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_save_internal, argc, argv ); } @@ -1501,7 +1501,7 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c, static int rpc_registry_getsd(struct net_context *c, int argc, const char **argv) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_getsd_internal, argc, argv); } @@ -1656,7 +1656,7 @@ static NTSTATUS rpc_registry_export_internal(struct net_context *c, static int rpc_registry_export(struct net_context *c, int argc, const char **argv ) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_export_internal, argc, argv ); } @@ -1994,7 +1994,7 @@ static NTSTATUS rpc_registry_import_internal(struct net_context *c, static int rpc_registry_import(struct net_context *c, int argc, const char **argv ) { - return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_winreg, 0, rpc_registry_import_internal, argc, argv ); } diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c index 737bfb0e86..c64f9abe77 100644 --- a/source3/utils/net_rpc_rights.c +++ b/source3/utils/net_rpc_rights.c @@ -630,7 +630,7 @@ static int rpc_rights_list(struct net_context *c, int argc, const char **argv ) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_rights_list_internal, argc, argv ); } @@ -652,7 +652,7 @@ static int rpc_rights_grant(struct net_context *c, int argc, const char **argv ) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_rights_grant_internal, argc, argv ); } @@ -674,7 +674,7 @@ static int rpc_rights_revoke(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0, rpc_rights_revoke_internal, argc, argv ); } @@ -751,13 +751,13 @@ struct rpc_sh_cmd *net_rpc_rights_cmds(struct net_context *c, TALLOC_CTX *mem_ct { static struct rpc_sh_cmd cmds[] = { - { "list", NULL, &ndr_table_lsarpc.syntax_id, rpc_sh_rights_list, + { "list", NULL, &ndr_table_lsarpc, rpc_sh_rights_list, N_("View available or assigned privileges") }, - { "grant", NULL, &ndr_table_lsarpc.syntax_id, rpc_sh_rights_grant, + { "grant", NULL, &ndr_table_lsarpc, rpc_sh_rights_grant, N_("Assign privilege[s]") }, - { "revoke", NULL, &ndr_table_lsarpc.syntax_id, rpc_sh_rights_revoke, + { "revoke", NULL, &ndr_table_lsarpc, rpc_sh_rights_revoke, N_("Revoke privilege[s]") }, { NULL, NULL, 0, NULL, NULL } diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 04aefbb13f..d6c0542bd6 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -335,7 +335,7 @@ int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv) if (!dc_info.is_ad) { printf(_("DC is not running Active Directory\n")); - ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_netlogon, 0, rpc_vampire_internals, argc, argv); return ret; @@ -350,13 +350,13 @@ int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv) return -1; } - ret = run_rpc_command(c, cli, &ndr_table_drsuapi.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_drsuapi, NET_FLAGS_SEAL | NET_FLAGS_TCP, rpc_vampire_ds_internals, argc, argv); if (ret != 0 && dc_info.is_mixed_mode) { printf(_("Fallback to NT4 vampire on Mixed-Mode AD " "Domain\n")); - ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_netlogon, 0, rpc_vampire_internals, argc, argv); } @@ -444,7 +444,7 @@ int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv) return 0; } - return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_netlogon, 0, rpc_vampire_ldif_internals, argc, argv); } @@ -601,17 +601,17 @@ int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv) if (!dc_info.is_ad) { printf(_("DC is not running Active Directory\n")); - ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_netlogon, 0, rpc_vampire_keytab_internals, argc, argv); } else { - ret = run_rpc_command(c, cli, &ndr_table_drsuapi.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_drsuapi, NET_FLAGS_SEAL | NET_FLAGS_TCP, rpc_vampire_keytab_ds_internals, argc, argv); if (ret != 0 && dc_info.is_mixed_mode) { printf(_("Fallback to NT4 vampire on Mixed-Mode AD " "Domain\n")); - ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id, + ret = run_rpc_command(c, cli, &ndr_table_netlogon, 0, rpc_vampire_keytab_internals, argc, argv); } diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c index c5d6954dfc..d1208e2ce2 100644 --- a/source3/utils/net_rpc_service.c +++ b/source3/utils/net_rpc_service.c @@ -918,7 +918,7 @@ static int rpc_service_list(struct net_context *c, int argc, const char **argv ) return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_list_internal, argc, argv ); } @@ -936,7 +936,7 @@ static int rpc_service_start(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_start_internal, argc, argv ); } @@ -954,7 +954,7 @@ static int rpc_service_stop(struct net_context *c, int argc, const char **argv ) return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_stop_internal, argc, argv ); } @@ -972,7 +972,7 @@ static int rpc_service_resume(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_resume_internal, argc, argv ); } @@ -990,7 +990,7 @@ static int rpc_service_pause(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_pause_internal, argc, argv ); } @@ -1008,7 +1008,7 @@ static int rpc_service_status(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_status_internal, argc, argv ); } @@ -1026,7 +1026,7 @@ static int rpc_service_delete(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_delete_internal, argc, argv); } @@ -1044,7 +1044,7 @@ static int rpc_service_create(struct net_context *c, int argc, const char **argv return 0; } - return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0, + return run_rpc_command(c, NULL, &ndr_table_svcctl, 0, rpc_service_create_internal, argc, argv); } diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c index 6f85be4f88..3fc6568dac 100644 --- a/source3/utils/net_rpc_sh_acct.c +++ b/source3/utils/net_rpc_sh_acct.c @@ -465,22 +465,22 @@ struct rpc_sh_cmd *net_rpc_acct_cmds(struct net_context *c, TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx) { static struct rpc_sh_cmd cmds[9] = { - { "show", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_pol_show, + { "show", NULL, &ndr_table_samr, rpc_sh_acct_pol_show, N_("Show current account policy settings") }, - { "badpw", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_badpw, + { "badpw", NULL, &ndr_table_samr, rpc_sh_acct_set_badpw, N_("Set bad password count before lockout") }, - { "lockduration", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_lockduration, + { "lockduration", NULL, &ndr_table_samr, rpc_sh_acct_set_lockduration, N_("Set account lockout duration") }, - { "resetduration", NULL, &ndr_table_samr.syntax_id, + { "resetduration", NULL, &ndr_table_samr, rpc_sh_acct_set_resetduration, N_("Set bad password count reset duration") }, - { "minpwage", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_minpwage, + { "minpwage", NULL, &ndr_table_samr, rpc_sh_acct_set_minpwage, N_("Set minimum password age") }, - { "maxpwage", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_maxpwage, + { "maxpwage", NULL, &ndr_table_samr, rpc_sh_acct_set_maxpwage, N_("Set maximum password age") }, - { "minpwlen", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_minpwlen, + { "minpwlen", NULL, &ndr_table_samr, rpc_sh_acct_set_minpwlen, N_("Set minimum password length") }, - { "pwhistlen", NULL, &ndr_table_samr.syntax_id, rpc_sh_acct_set_pwhistlen, + { "pwhistlen", NULL, &ndr_table_samr, rpc_sh_acct_set_pwhistlen, N_("Set the password history length") }, { NULL, NULL, 0, NULL, NULL } }; diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c index 42dfc48d4a..60860663c6 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->interface, + status = cli_rpc_pipe_open_noauth(ctx->cli, &cmd->table->syntax_id, &pipe_hnd); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("Could not open pipe: %s\n"), @@ -197,7 +197,7 @@ static bool net_sh_process(struct net_context *c, static struct rpc_sh_cmd sh_cmds[6] = { - { "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_info, + { "info", NULL, &ndr_table_samr, rpc_sh_info, N_("Print information about the domain connected to") }, { "rights", net_rpc_rights_cmds, 0, NULL, |