[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Mar 9 04:07:02 MST 2011


The branch, master has been updated
       via  5a59dcc s4:samba-tool: improve help messages for samba-tool password
      from  dec9d03 libsmbclient: Fix a typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5a59dcc26ca5f218e76f7ed533472a98561c58ca
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 9 10:29:20 2011 +0100

    s4:samba-tool: improve help messages for samba-tool password
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Mar  9 12:06:53 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/samba_tool/password.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/samba_tool/password.c b/source4/samba_tool/password.c
index 96b845b..47d8f1f 100644
--- a/source4/samba_tool/password.c
+++ b/source4/samba_tool/password.c
@@ -31,7 +31,7 @@
 
 static int net_password_change_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_change_usage: TODO\n");
+	d_printf("samba-tool password change [options]\n");
 	return 0;
 }
 
@@ -81,7 +81,7 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a
 
 static int net_password_set_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("net_password_set_usage: TODO\n");
+	d_printf("samba-tool password set <username> [<password>] [options]\n");
 	return 0;
 }
 
@@ -109,8 +109,8 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
 			new_password = argv[1];
 			break;
 		default: /* too mayn args -> fail */
-			DEBUG(0,("net_password_set: too many args [%d]\n",argc));
-			return net_password_usage(ctx, argc, argv);
+			DEBUG(0,("samba-tool password set: too many args [%d]\n",argc));
+			return net_password_set_usage(ctx, argc, argv);
 	}
 
 	if ((p = strchr_m(tmp,'\\'))) {
@@ -167,5 +167,8 @@ int net_password(struct net_context *ctx, int argc, const char **argv)
 int net_password_usage(struct net_context *ctx, int argc, const char **argv)
 {
 	d_printf("samba-tool password <command> [options]\n");
+	d_printf("available commands:\n");
+	net_password_change_usage(ctx, argc, argv);
+	net_password_set_usage(ctx, argc, argv);
 	return 0;
 }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list