summaryrefslogtreecommitdiffstats
path: root/source3/utils/net_rpc_shell.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-08 19:37:26 +0100
committerVolker Lendecke <vl@samba.org>2009-11-08 19:43:46 +0100
commitb02c46bef944712834045399c883ea14f45bde94 (patch)
tree55168d16ade6971be5de092305eb7a3016336820 /source3/utils/net_rpc_shell.c
parent6a650d7d161e4c4a7bd61bb374f473ba16fbba95 (diff)
downloadsamba-b02c46bef944712834045399c883ea14f45bde94.tar.gz
samba-b02c46bef944712834045399c883ea14f45bde94.tar.xz
samba-b02c46bef944712834045399c883ea14f45bde94.zip
Revert "s3: Make run_rpc_command take strings instead of a ndr_interface_table"
This reverts commit 53f2a1595e76db9fe1b42db65b51895b73365993.
Diffstat (limited to 'source3/utils/net_rpc_shell.c')
-rw-r--r--source3/utils/net_rpc_shell.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index 5b94fac145c..5e0f1503712 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -70,21 +70,16 @@ static NTSTATUS net_sh_run(struct net_context *c,
{
TALLOC_CTX *mem_ctx;
struct rpc_pipe_client *pipe_hnd;
- struct ndr_syntax_id syntax;
NTSTATUS status;
- if (!ndr_syntax_from_string(cmd->interface, cmd->interface_version,
- &syntax)) {
- return NT_STATUS_INVALID_PARAMETER;
- }
-
mem_ctx = talloc_new(ctx);
if (mem_ctx == NULL) {
d_fprintf(stderr, _("talloc_new failed\n"));
return NT_STATUS_NO_MEMORY;
}
- status = cli_rpc_pipe_open_noauth(ctx->cli, &syntax, &pipe_hnd);
+ status = cli_rpc_pipe_open_noauth(ctx->cli, cmd->interface,
+ &pipe_hnd);
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, _("Could not open pipe: %s\n"),
nt_errstr(status));
@@ -195,22 +190,22 @@ static bool net_sh_process(struct net_context *c,
static struct rpc_sh_cmd sh_cmds[6] = {
- { "info", NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, rpc_sh_info,
+ { "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_info,
N_("Print information about the domain connected to") },
- { "rights", net_rpc_rights_cmds, NULL, 0, NULL,
+ { "rights", net_rpc_rights_cmds, 0, NULL,
N_("List/Grant/Revoke user rights") },
- { "share", net_rpc_share_cmds, NULL, 0, NULL,
+ { "share", net_rpc_share_cmds, 0, NULL,
N_("List/Add/Remove etc shares") },
- { "user", net_rpc_user_cmds, NULL, 0, NULL,
+ { "user", net_rpc_user_cmds, 0, NULL,
N_("List/Add/Remove user info") },
- { "account", net_rpc_acct_cmds, NULL, 0, NULL,
+ { "account", net_rpc_acct_cmds, 0, NULL,
N_("Show/Change account policy settings") },
- { NULL, NULL, NULL, 0, NULL, NULL }
+ { NULL, NULL, 0, NULL, NULL }
};
int net_rpc_shell(struct net_context *c, int argc, const char **argv)