svn commit: samba r5400 - in branches/SAMBA_4_0/source/utils/net: .

[mimir at samba.org]

Author: mimir
Date: 2005-02-15 01:11:20 +0000 (Tue, 15 Feb 2005)
New Revision: 5400

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5400

Log:
Slightly better handling of help messages in net tool.


rafal


Modified:
   branches/SAMBA_4_0/source/utils/net/net_join.c
   branches/SAMBA_4_0/source/utils/net/net_password.c
   branches/SAMBA_4_0/source/utils/net/net_time.c
   branches/SAMBA_4_0/source/utils/net/net_user.c


Changeset:
Modified: branches/SAMBA_4_0/source/utils/net/net_join.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_join.c	2005-02-14 23:39:32 UTC (rev 5399)
+++ branches/SAMBA_4_0/source/utils/net/net_join.c	2005-02-15 01:11:20 UTC (rev 5400)
@@ -36,8 +36,7 @@
 
 	switch (argc) {
 		case 0: /* no args -> fail */
-			DEBUG(0,("net_join_domain: no args\n"));
-			return -1;
+			return net_join_usage(ctx, argc, argv);
 		case 1: /* only DOMAIN */
 			tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
 			break;
@@ -49,12 +48,11 @@
 				secure_channel_type = SEC_CHAN_WKSTA;
 			} else {
 				DEBUG(0, ("net_join: 2nd argument must be MEMBER or BDC\n"));
-				return -1;
+				return net_join_usage(ctx, argc, argv);
 			}
 			break;
 		default: /* too many args -> fail */
-			DEBUG(0,("net_join: too many args [%d]\n",argc));
-			return -1;
+			return net_join_usage(ctx, argc, argv);
 	}
 
 	domain_name = tmp;
@@ -89,12 +87,12 @@
 
 int net_join_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_usage: TODO\n");
+	d_printf("net join <domain> [BDC | MEMBER] [options]\n");
 	return 0;	
 }
 
 int net_join_help(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_help: TODO\n");
+	d_printf("Joins domain as either member or backup domain controller.\n");
 	return 0;	
 }

Modified: branches/SAMBA_4_0/source/utils/net/net_password.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_password.c	2005-02-14 23:39:32 UTC (rev 5399)
+++ branches/SAMBA_4_0/source/utils/net/net_password.c	2005-02-15 01:11:20 UTC (rev 5400)
@@ -29,7 +29,6 @@
  * Code for Changing and setting a password
  */
 
-
 static int net_password_change(struct net_context *ctx, int argc, const char **argv)
 {
 	NTSTATUS status;
@@ -99,8 +98,7 @@
 
 	switch (argc) {
 		case 0: /* no args -> fail */
-			DEBUG(0,("net_password_set: no args\n"));
-			return -1;
+			return net_password_usage(ctx, argc, argv);
 		case 1: /* only DOM\\user; prompt for password */
 			tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
 			break;
@@ -110,7 +108,7 @@
 			break;
 		default: /* too mayn args -> fail */
 			DEBUG(0,("net_password_set: too many args [%d]\n",argc));
-			return -1;
+			return net_password_usage(ctx, argc, argv);
 	}
 
 	if ((p = strchr_m(tmp,'\\'))) {
@@ -169,6 +167,7 @@
 static const struct net_functable net_password_functable[] = {
 	{"change", net_password_change, net_password_change_usage,  net_password_change_help},
 	{"set", net_password_set, net_password_set_usage,  net_password_set_help},
+	{"help", net_password_help, net_password_help, net_password_help},
 	{NULL, NULL}
 };
 
@@ -179,12 +178,14 @@
 
 int net_password_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_usage: TODO\n");
+	d_printf("net password <command> [options]\n");
 	return 0;	
 }
 
 int net_password_help(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_help: TODO\n");
+	d_printf("Account password handling:\n");
+	d_printf("\tchange\t\tchanges password (old password required)\n");
+	d_printf("\tset\t\tsets password\n");
 	return 0;	
 }

Modified: branches/SAMBA_4_0/source/utils/net/net_time.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_time.c	2005-02-14 23:39:32 UTC (rev 5399)
+++ branches/SAMBA_4_0/source/utils/net/net_time.c	2005-02-15 01:11:20 UTC (rev 5400)
@@ -28,7 +28,6 @@
  * Code for getting the remote time
  */
 
-
 int net_time(struct net_context *ctx, int argc, const char **argv)
 {
 	NTSTATUS status;
@@ -41,8 +40,7 @@
 	if (argc > 0 && argv[0]) {
 		server_name = argv[0];
 	} else {
-		DEBUG(0,("net_time: server name needed!\n"));
-		return -1;
+		return net_time_usage(ctx, argc, argv);
 	}
 
 	libnetctx = libnet_context_init();
@@ -77,12 +75,12 @@
 
 int net_time_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_time_usage: TODO\n");
+	d_printf("net time <server> [options]\n");
 	return 0;	
 }
 
 int net_time_help(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_time_help: TODO\n");
+	d_printf("Displays remote server's time.\n");
 	return 0;	
 }

Modified: branches/SAMBA_4_0/source/utils/net/net_user.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_user.c	2005-02-14 23:39:32 UTC (rev 5399)
+++ branches/SAMBA_4_0/source/utils/net/net_user.c	2005-02-15 01:11:20 UTC (rev 5400)
@@ -69,7 +69,8 @@
 
 
 static const struct net_functable net_user_functable[] = {
-	{ "add", net_user_add, net_user_usage,  net_user_help },
+	{ "add", net_user_add, net_user_usage, net_user_help },
+	{ "help", net_user_help, net_user_usage, net_user_help },
 	{ NULL, NULL }
 };
 
@@ -83,7 +84,7 @@
 int net_user_help(struct net_context *ctx, int argc, const char **argv)
 {
 	d_printf("User accounts management:\n");
-	d_printf("\t\tadd\t creates new account\n");
+	d_printf("\tadd\t\tcreates new account\n");
 	return 0;
 }