X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=source3%2Futils%2Fnet_rpc_shell.c;h=e78af142fa15b6f72606c8f37734925407276b93;hp=6abdb03c48d02ac882bcd21bdedccd78542c5de0;hb=3eeb988248db7d99e4392eb4bc3d05e953944ddb;hpb=1335da2a7cc639310e5d389e8e8dbe67c4e7ca25;ds=sidebyside

diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index 6abdb03c48d..e78af142fa1 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -74,15 +74,14 @@ static NTSTATUS net_sh_run(struct net_context *c,
 
 	mem_ctx = talloc_new(ctx);
 	if (mem_ctx == NULL) {
-		d_fprintf(stderr, "talloc_new failed\n");
+		d_fprintf(stderr, _("talloc_new failed\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	status = cli_rpc_pipe_open_noauth(ctx->cli,
-					  cli_get_iface(cmd->pipe_idx),
+	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",
+		d_fprintf(stderr, _("Could not open pipe: %s\n"),
 			  nt_errstr(status));
 		return status;
 	}
@@ -142,13 +141,13 @@ static bool net_sh_process(struct net_context *c,
 
 	if (cmd->name == NULL) {
 		/* None found */
-		d_fprintf(stderr, "%s: unknown cmd\n", argv[0]);
+		d_fprintf(stderr,_( "%s: unknown cmd\n"), argv[0]);
 		return true;
 	}
 
 	new_ctx = TALLOC_P(ctx, struct rpc_sh_ctx);
 	if (new_ctx == NULL) {
-		d_fprintf(stderr, "talloc failed\n");
+		d_fprintf(stderr, _("talloc failed\n"));
 		return false;
 	}
 	new_ctx->cli = ctx->cli;
@@ -180,7 +179,7 @@ static bool net_sh_process(struct net_context *c,
 	status = net_sh_run(c, new_ctx, cmd, argc, argv);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		d_fprintf(stderr, "%s failed: %s\n", new_ctx->whoami,
+		d_fprintf(stderr, _("%s failed: %s\n"), new_ctx->whoami,
 			  nt_errstr(status));
 	}
 
@@ -189,20 +188,20 @@ static bool net_sh_process(struct net_context *c,
 
 static struct rpc_sh_cmd sh_cmds[6] = {
 
-	{ "info", NULL, PI_SAMR, rpc_sh_info,
-	  "Print information about the domain connected to" },
+	{ "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_info,
+	  N_("Print information about the domain connected to") },
 
 	{ "rights", net_rpc_rights_cmds, 0, NULL,
-	  "List/Grant/Revoke user rights" },
+	  N_("List/Grant/Revoke user rights") },
 
 	{ "share", net_rpc_share_cmds, 0, NULL,
-	  "List/Add/Remove etc shares" },
+	  N_("List/Add/Remove etc shares") },
 
 	{ "user", net_rpc_user_cmds, 0, NULL,
-	  "List/Add/Remove user info" },
+	  N_("List/Add/Remove user info") },
 
 	{ "account", net_rpc_acct_cmds, 0, NULL,
-	  "Show/Change account policy settings" },
+	  N_("Show/Change account policy settings") },
 
 	{ NULL, NULL, 0, NULL, NULL }
 };
@@ -213,20 +212,29 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
 	struct rpc_sh_ctx *ctx;
 
 	if (argc != 0 || c->display_usage) {
-		d_printf("Usage:\n"
-			 "net rpc shell\n");
+		d_printf(_("Usage:\n"
+			   "net rpc shell\n"));
 		return -1;
 	}
 
+	if (libnetapi_init(&c->netapi_ctx) != 0) {
+		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) {
-		d_fprintf(stderr, "talloc failed\n");
+		d_fprintf(stderr, _("talloc failed\n"));
 		return -1;
 	}
 
 	status = net_make_ipc_connection(c, 0, &(ctx->cli));
 	if (!NT_STATUS_IS_OK(status)) {
-		d_fprintf(stderr, "Could not open connection: %s\n",
+		d_fprintf(stderr, _("Could not open connection: %s\n"),
 			  nt_errstr(status));
 		return -1;
 	}
@@ -241,7 +249,7 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
 		return -1;
 	}
 
-	d_printf("Talking to domain %s (%s)\n", ctx->domain_name,
+	d_printf(_("Talking to domain %s (%s)\n"), ctx->domain_name,
 		 sid_string_tos(ctx->domain_sid));
 
 	this_ctx = ctx;
@@ -268,7 +276,7 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
 			continue;
 		}
 		if (ret != 0) {
-			d_fprintf(stderr, "cmdline invalid: %s\n",
+			d_fprintf(stderr, _("cmdline invalid: %s\n"),
 				  poptStrerror(ret));
 			SAFE_FREE(line);
 			return false;