From 0210f7af917d0e4ea1f16f9c6e767b8fe817c095 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 15 May 2008 10:14:41 +0200
Subject: net: The top level help function for net cmd is always net_cmd_usage
 (This used to be commit f7d0903a58b0b0fc248a613937a101f15baa5311)

---
 source3/utils/net_dom.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'source3/utils/net_dom.c')

diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c
index 1a876a7ba3..a0de818bff 100644
--- a/source3/utils/net_dom.c
+++ b/source3/utils/net_dom.c
@@ -20,22 +20,14 @@
 #include "includes.h"
 #include "utils/net.h"
 
-static int net_dom_usage(struct net_context *c, int argc, const char **argv)
+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");
+		 "<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");
-
-	return -1;
-}
-
-int net_help_dom(struct net_context *c, int argc, const char **argv)
-{
-	d_printf("net dom join"\
-		"\n  Join a remote machine\n");
-	d_printf("net dom unjoin"\
-		"\n  Unjoin a remote machine\n");
+		 "<account=ACCOUNT> <password=PASSWORD> <reboot>\n"\
+		 "  Unjoin a remote machine\n");
 
 	return -1;
 }
@@ -238,7 +230,7 @@ int net_dom(struct net_context *c, int argc, const char **argv)
 	struct functable func[] = {
 		{"JOIN", net_dom_join},
 		{"UNJOIN", net_dom_unjoin},
-		{"HELP", net_help_dom},
+		{"HELP", net_dom_usage},
 		{NULL, NULL}
 	};
 
-- 
cgit