svn commit: samba r6826 - in trunk/source/utils: .

jht at samba.org jht at samba.org
Mon May 16 19:50:12 GMT 2005


Author: jht
Date: 2005-05-16 19:50:11 +0000 (Mon, 16 May 2005)
New Revision: 6826

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

Log:
Merging changes from 3_0 branch.
Modified:
   trunk/source/utils/net_help.c
   trunk/source/utils/net_rpc.c


Changeset:
Modified: trunk/source/utils/net_help.c
===================================================================
--- trunk/source/utils/net_help.c	2005-05-16 18:57:56 UTC (rev 6825)
+++ trunk/source/utils/net_help.c	2005-05-16 19:50:11 UTC (rev 6826)
@@ -73,7 +73,7 @@
 		 "\n\tDelete specified user\n");
 	d_printf("\nnet [<method>] user INFO <name> [misc. options] [targets]"\
 		 "\n\tList the domain groups of the specified user\n");
-	d_printf("\nnet [<method>] user ADD <name> [password] [-c container] "\
+	d_printf("\nnet [<method>] user ADD <name> [-c container] "\
 		 "[-F user flags] [misc. options]"\
 		 " [targets]\n\tAdd specified user\n");
 	d_printf("\nnet [<method>] user RENAME <oldusername> <newusername>"\

Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c	2005-05-16 18:57:56 UTC (rev 6825)
+++ trunk/source/utils/net_rpc.c	2005-05-16 19:50:11 UTC (rev 6826)
@@ -663,6 +663,11 @@
 	}
 
 	/* Display results */
+    if (!NT_STATUS_IS_OK(result)) {
+		d_printf("Failed to delete user account - %s\n", nt_errstr(result));
+    } else {
+        d_printf("Deleted user account\n");
+    }
 
  done:
 	return result;
@@ -5474,7 +5479,7 @@
 {
 	d_printf("  net rpc info \t\t\tshow basic info about a domain \n");
 	d_printf("  net rpc join \t\t\tto join a domain \n");
-	d_printf("  net rpc oldjoin \t\tto join a domain created in server manager\n");
+	d_printf("  net rpc oldjoin \t\t\tto join a domain created in server manager\n");
 	d_printf("  net rpc testjoin \t\ttests that a join is valid\n");
 	d_printf("  net rpc user \t\t\tto add, delete and list users\n");
 	d_printf("  net rpc password <username> [<password>] -Uadmin_username%%admin_pass\n");



More information about the samba-cvs mailing list