s3:net ads join: reduce indentation in _net_ads_join_dns_updates()

[ira/wip.git] / source3 / utils / net_dom.c

diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c
index 401079777f88b07702d65bb04580ed338b81604a..b2f02a4f4f7645cf0553070b3ec0f6a152e918a3 100644 (file)
--- a/source3/utils/net_dom.c
+++ b/source3/utils/net_dom.c
@@ -19,19 +19,30 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
+#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_net.h"
+#include "libsmb/libsmb.h"
 
 int net_dom_usage(struct net_context *c, int argc, const char **argv)
 {
-       d_printf("usage: net dom join "
-                "<domain=DOMAIN> <ou=OU> <account=ACCOUNT> "
-                "<password=PASSWORD> <reboot>\n  Join a remote machine\n");
-       d_printf("usage: net dom unjoin "
-                "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
-                "  Unjoin a remote machine\n");
-       d_printf("usage: net dom renamecomputer "
-                "<newname=NEWNAME> "
-                "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
-                "  Rename joined computer\n");
+       d_printf("%s\n%s",
+               _("Usage:"),
+               _("net dom join "
+                  "<domain=DOMAIN> <ou=OU> <account=ACCOUNT> "
+                  "<password=PASSWORD> <reboot>\n  Join a remote machine\n"));
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net dom unjoin "
+                  "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
+                  "  Unjoin a remote machine\n"));
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net dom renamecomputer "
+                  "<newname=NEWNAME> "
+                  "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
+                  "  Rename joined computer\n"));
 
        return -1;
 }
@@ -88,26 +99,26 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv)
 
        status = NetUnjoinDomain(server_name, account, password, unjoin_flags);
        if (status != 0) {
-               printf("Failed to unjoin domain: %s\n",
+               printf(_("Failed to unjoin domain: %s\n"),
                        libnetapi_get_error_string(c->netapi_ctx, status));
                goto done;
        }
 
        if (do_reboot) {
-               c->opt_comment = "Shutting down due to a domain membership "
-                                "change";
+               c->opt_comment = _("Shutting down due to a domain membership "
+                                  "change");
                c->opt_reboot = true;
                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;
@@ -195,25 +206,25 @@ static int net_dom_join(struct net_context *c, int argc, const char **argv)
        status = NetJoinDomain(server_name, domain_name, account_ou,
                               Account, password, join_flags);
        if (status != 0) {
-               printf("Failed to join domain: %s\n",
+               printf(_("Failed to join domain: %s\n"),
                        libnetapi_get_error_string(c->netapi_ctx, status));
                goto done;
        }
 
        if (do_reboot) {
-               c->opt_comment = "Shutting down due to a domain membership "
-                                "change";
+               c->opt_comment = _("Shutting down due to a domain membership "
+                                  "change");
                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;
@@ -287,9 +298,9 @@ static int net_dom_renamecomputer(struct net_context *c, int argc, const char **
        status = NetRenameMachineInDomain(server_name, newname,
                                          account, password, rename_options);
        if (status != 0) {
-               printf("Failed to rename machine: ");
+               printf(_("Failed to rename machine: "));
                if (status == W_ERROR_V(WERR_SETUP_NOT_JOINED)) {
-                       printf("Computer is not joined to a Domain\n");
+                       printf(_("Computer is not joined to a Domain\n"));
                        goto done;
                }
                printf("%s\n",
@@ -298,19 +309,19 @@ static int net_dom_renamecomputer(struct net_context *c, int argc, const char **
        }
 
        if (do_reboot) {
-               c->opt_comment = "Shutting down due to a computer rename";
+               c->opt_comment = _("Shutting down due to a computer rename");
                c->opt_reboot = true;
                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;
@@ -335,35 +346,35 @@ int net_dom(struct net_context *c, int argc, const char **argv)
                        "join",
                        net_dom_join,
                        NET_TRANSPORT_LOCAL,
-                       "Join a remote machine",
-                       "net dom join <domain=DOMAIN> <ou=OU> "
-                       "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
-                       "  Join a remote machine"
+                       N_("Join a remote machine"),
+                       N_("net dom join <domain=DOMAIN> <ou=OU> "
+                          "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"
+                          "  Join a remote machine")
                },
                {
                        "unjoin",
                        net_dom_unjoin,
                        NET_TRANSPORT_LOCAL,
-                       "Unjoin a remote machine",
-                       "net dom unjoin <account=ACCOUNT> <password=PASSWORD> "
-                       "<reboot>\n"
-                       "  Unjoin a remote machine"
+                       N_("Unjoin a remote machine"),
+                       N_("net dom unjoin <account=ACCOUNT> "
+                          "<password=PASSWORD> <reboot>\n"
+                          "  Unjoin a remote machine")
                },
                {
                        "renamecomputer",
                        net_dom_renamecomputer,
                        NET_TRANSPORT_LOCAL,
-                       "Rename a computer that is joined to a domain",
-                       "net dom renamecomputer <newname=NEWNAME> "
-                       "<account=ACCOUNT> <password=PASSWORD> "
-                       "<reboot>\n"
-                       "  Rename joined computer"
+                       N_("Rename a computer that is joined to a domain"),
+                       N_("net dom renamecomputer <newname=NEWNAME> "
+                          "<account=ACCOUNT> <password=PASSWORD> "
+                          "<reboot>\n"
+                          "  Rename joined computer")
                },
 
                {NULL, NULL, 0, NULL, NULL}
        };
 
-       status = libnetapi_init(&c->netapi_ctx);
+       status = libnetapi_net_init(&c->netapi_ctx);
        if (status != 0) {
                return -1;
        }