summaryrefslogtreecommitdiff
path: root/source/utils/net_rpc_shell.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/utils/net_rpc_shell.c')
-rw-r--r--source/utils/net_rpc_shell.c86
1 files changed, 36 insertions, 50 deletions
diff --git a/source/utils/net_rpc_shell.c b/source/utils/net_rpc_shell.c
index 3aaed1ed18..e6302b652e 100644
--- a/source/utils/net_rpc_shell.c
+++ b/source/utils/net_rpc_shell.c
@@ -21,12 +21,11 @@
#include "includes.h"
#include "utils/net.h"
-static NTSTATUS rpc_sh_info(struct net_context *c,
- TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx,
+static NTSTATUS rpc_sh_info(TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_info_internals(c, ctx->domain_sid, ctx->domain_name,
+ return rpc_info_internals(ctx->domain_sid, ctx->domain_name,
ctx->cli, pipe_hnd, mem_ctx,
argc, argv);
}
@@ -64,8 +63,7 @@ static char **completion_fn(const char *text, int start, int end)
return cmds;
}
-static NTSTATUS net_sh_run(struct net_context *c,
- struct rpc_sh_ctx *ctx, struct rpc_sh_cmd *cmd,
+static NTSTATUS net_sh_run(struct rpc_sh_ctx *ctx, struct rpc_sh_cmd *cmd,
int argc, const char **argv)
{
TALLOC_CTX *mem_ctx;
@@ -78,33 +76,31 @@ static NTSTATUS net_sh_run(struct net_context *c,
return NT_STATUS_NO_MEMORY;
}
- status = cli_rpc_pipe_open_noauth(ctx->cli, cmd->interface,
- &pipe_hnd);
- if (!NT_STATUS_IS_OK(status)) {
+ pipe_hnd = cli_rpc_pipe_open_noauth(ctx->cli, cmd->pipe_idx, &status);
+ if (pipe_hnd == NULL) {
d_fprintf(stderr, "Could not open pipe: %s\n",
nt_errstr(status));
return status;
}
- status = cmd->fn(c, mem_ctx, ctx, pipe_hnd, argc, argv);
+ status = cmd->fn(mem_ctx, ctx, pipe_hnd, argc, argv);
- TALLOC_FREE(pipe_hnd);
+ cli_rpc_pipe_close(pipe_hnd);
talloc_destroy(mem_ctx);
return status;
}
-static bool net_sh_process(struct net_context *c,
- struct rpc_sh_ctx *ctx,
+static bool net_sh_process(struct rpc_sh_ctx *ctx,
int argc, const char **argv)
{
- struct rpc_sh_cmd *cmd;
+ struct rpc_sh_cmd *c;
struct rpc_sh_ctx *new_ctx;
NTSTATUS status;
if (argc == 0) {
- return true;
+ return True;
}
if (ctx == this_ctx) {
@@ -115,48 +111,48 @@ static bool net_sh_process(struct net_context *c,
new_ctx = this_ctx->parent;
TALLOC_FREE(this_ctx);
this_ctx = new_ctx;
- return true;
+ return True;
}
}
if (strequal(argv[0], "exit") || strequal(argv[0], "quit")) {
- return false;
+ return False;
}
if (strequal(argv[0], "help") || strequal(argv[0], "?")) {
- for (cmd = ctx->cmds; cmd->name != NULL; cmd++) {
+ for (c = ctx->cmds; c->name != NULL; c++) {
if (ctx != this_ctx) {
d_printf("%s ", ctx->whoami);
}
- d_printf("%-15s %s\n", cmd->name, cmd->help);
+ d_printf("%-15s %s\n", c->name, c->help);
}
- return true;
+ return True;
}
- for (cmd = ctx->cmds; cmd->name != NULL; cmd++) {
- if (strequal(cmd->name, argv[0])) {
+ for (c = ctx->cmds; c->name != NULL; c++) {
+ if (strequal(c->name, argv[0])) {
break;
}
}
- if (cmd->name == NULL) {
+ if (c->name == NULL) {
/* None found */
d_fprintf(stderr, "%s: unknown cmd\n", argv[0]);
- return true;
+ return True;
}
new_ctx = TALLOC_P(ctx, struct rpc_sh_ctx);
if (new_ctx == NULL) {
d_fprintf(stderr, "talloc failed\n");
- return false;
+ return False;
}
new_ctx->cli = ctx->cli;
new_ctx->whoami = talloc_asprintf(new_ctx, "%s %s",
- ctx->whoami, cmd->name);
- new_ctx->thiscmd = talloc_strdup(new_ctx, cmd->name);
+ ctx->whoami, c->name);
+ new_ctx->thiscmd = talloc_strdup(new_ctx, c->name);
- if (cmd->sub != NULL) {
- new_ctx->cmds = cmd->sub(c, new_ctx, ctx);
+ if (c->sub != NULL) {
+ new_ctx->cmds = c->sub(new_ctx, ctx);
} else {
new_ctx->cmds = NULL;
}
@@ -168,27 +164,27 @@ static bool net_sh_process(struct net_context *c,
argc -= 1;
argv += 1;
- if (cmd->sub != NULL) {
+ if (c->sub != NULL) {
if (argc == 0) {
this_ctx = new_ctx;
- return true;
+ return True;
}
- return net_sh_process(c, new_ctx, argc, argv);
+ return net_sh_process(new_ctx, argc, argv);
}
- status = net_sh_run(c, new_ctx, cmd, argc, argv);
+ status = net_sh_run(new_ctx, c, argc, argv);
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, "%s failed: %s\n", new_ctx->whoami,
nt_errstr(status));
}
- return true;
+ return True;
}
static struct rpc_sh_cmd sh_cmds[6] = {
- { "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_info,
+ { "info", NULL, PI_SAMR, rpc_sh_info,
"Print information about the domain connected to" },
{ "rights", net_rpc_rights_cmds, 0, NULL,
@@ -206,25 +202,15 @@ static struct rpc_sh_cmd sh_cmds[6] = {
{ NULL, NULL, 0, NULL, NULL }
};
-int net_rpc_shell(struct net_context *c, int argc, const char **argv)
+int net_rpc_shell(int argc, const char **argv)
{
NTSTATUS status;
struct rpc_sh_ctx *ctx;
- if (argc != 0 || c->display_usage) {
- d_printf("Usage:\n"
- "net rpc shell\n");
- return -1;
- }
-
- if (libnetapi_init(&c->netapi_ctx) != 0) {
+ if (argc != 0) {
+ d_fprintf(stderr, "usage: net rpc shell\n");
return -1;
}
- libnetapi_set_username(c->netapi_ctx, c->opt_user_name);
- libnetapi_set_password(c->netapi_ctx, c->opt_password);
- if (c->opt_kerberos) {
- libnetapi_set_use_kerberos(c->netapi_ctx);
- }
ctx = TALLOC_P(NULL, struct rpc_sh_ctx);
if (ctx == NULL) {
@@ -232,7 +218,7 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
return -1;
}
- status = net_make_ipc_connection(c, 0, &(ctx->cli));
+ status = net_make_ipc_connection(0, &(ctx->cli));
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, "Could not open connection: %s\n",
nt_errstr(status));
@@ -279,11 +265,11 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
d_fprintf(stderr, "cmdline invalid: %s\n",
poptStrerror(ret));
SAFE_FREE(line);
- return false;
+ return False;
}
if ((line[0] != '\n') &&
- (!net_sh_process(c, this_ctx, argc, argv))) {
+ (!net_sh_process(this_ctx, argc, argv))) {
SAFE_FREE(line);
break;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-06 05:42:38 +0000