s4:net utility - add a notice for the "help" operation and format it's output of...

[ira/wip.git] / source4 / utils / net / net.c

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 17b12b7103d316a8cb1725710947c1602bafa3b4..828e46889ea1f103733be569debb06d16f0e85f3 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -16,7 +16,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -25,8 +25,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
  
 /*****************************************************/
@@ -44,7 +43,11 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
-#include "smb_build.h"
+#include "lib/ldb/include/ldb.h"
+#include "librpc/rpc/dcerpc.h"
+#include "param/param.h"
+#include "lib/events/events.h"
+#include "auth/credentials/credentials.h"
 
 /*
   run a function from a function table. If not found then
@@ -81,12 +84,7 @@ int net_run_usage(struct net_context *ctx,
                        const struct net_functable *functable)
 {
        int i;
-/*
-       if (argc < 1) {
-               d_printf("net_run_usage: TODO (argc < 1)\n");
-               return 1;
-       }
-*/
+
        for (i=0; functable[i].name; i++) {
                if (strcasecmp_m(argv[0], functable[i].name) == 0)
                        if (functable[i].usage) {
@@ -106,8 +104,11 @@ static const struct net_functable net_functable[] = {
        {"time", "get remote server's time\n", net_time, net_time_usage},
        {"join", "join a domain\n", net_join, net_join_usage},
        {"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
-       {"samsync", "syncrosnise into the local ldb the sam of a domain\n", net_samsync_ldb, net_samsync_ldb_usage},
+       {"export", "dump the sam of this domain\n", net_export, net_export_usage},
+       {"vampire", "join and syncronise an AD domain onto the local server\n", net_vampire, net_vampire_usage},
+       {"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
        {"user", "manage user accounts\n", net_user, net_user_usage},
+       {"machinepw", "Get a machine password out of our SAM\n", net_machinepw, net_machinepw_usage},
        {NULL, NULL, NULL, NULL}
 };
 
@@ -119,7 +120,11 @@ int net_help(struct net_context *ctx, const struct net_functable *ftable)
 
        d_printf("Available commands:\n");
        while (name && desc) {
-               d_printf("\t%s\t\t%s", name, desc);
+               if (strlen(name) > 7) {
+                       d_printf("\t%s\t%s", name, desc);
+               } else {
+                       d_printf("\t%s\t\t%s", name, desc);
+               }
                name = ftable[++i].name;
                desc = ftable[i].desc;
        }
@@ -131,6 +136,7 @@ static int net_usage(struct net_context *ctx, int argc, const char **argv)
 {
        d_printf("Usage:\n");
        d_printf("net <command> [options]\n");
+       d_printf("Type 'net help' for all available commands\n");
        return 0;
 }
 
@@ -143,7 +149,7 @@ static int binary_net(int argc, const char **argv)
        int rc;
        int argc_new;
        const char **argv_new;
-       TALLOC_CTX *mem_ctx;
+       struct tevent_context *ev;
        struct net_context *ctx = NULL;
        poptContext pc;
        struct poptOption long_options[] = {
@@ -152,12 +158,10 @@ static int binary_net(int argc, const char **argv)
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
                POPT_COMMON_VERSION
-               POPT_TABLEEND
+               { NULL }
        };
 
-#ifdef HAVE_SETBUFFER
-       setbuffer(stdout, NULL, 0);
-#endif
+       setlinebuf(stdout);
 
        pc = poptGetContext("net", argc, (const char **) argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
@@ -186,18 +190,23 @@ static int binary_net(int argc, const char **argv)
                return net_usage(ctx, argc, argv);
        }
 
-       net_init_subsystems;
+       dcerpc_init(cmdline_lp_ctx);
 
-       mem_ctx = talloc_init("net_context");
-       ctx = talloc(mem_ctx, struct net_context);
+       ev = s4_event_context_init(NULL);
+       if (!ev) {
+               d_printf("Failed to create an event context\n");
+               exit(1);
+       }
+       ctx = talloc(ev, struct net_context);
        if (!ctx) {
-               d_printf("talloc_init(net_context) failed\n");
+               d_printf("Failed to talloc a net_context\n");
                exit(1);
        }
 
        ZERO_STRUCTP(ctx);
-       ctx->mem_ctx = mem_ctx;
+       ctx->lp_ctx = cmdline_lp_ctx;
        ctx->credentials = cmdline_credentials;
+       ctx->event_ctx = ev;
 
        rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
@@ -205,7 +214,7 @@ static int binary_net(int argc, const char **argv)
                DEBUG(0,("return code = %d\n", rc));
        }
 
-       talloc_free(mem_ctx);
+       talloc_free(ev);
        return rc;
 }