svn commit: samba r15518 - in branches/SAMBA_4_0/source/setup: .

[tridge at samba.org]

Author: tridge
Date: 2006-05-09 03:50:32 +0000 (Tue, 09 May 2006)
New Revision: 15518

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

Log:

the 'password' option in POPT_COMMON_CREDENTIALS was conflicting with
the password option in newuser. Move the local options above the
global options to fix.

Modified:
   branches/SAMBA_4_0/source/setup/newuser


Changeset:
Modified: branches/SAMBA_4_0/source/setup/newuser
===================================================================
--- branches/SAMBA_4_0/source/setup/newuser	2006-05-09 03:41:11 UTC (rev 15517)
+++ branches/SAMBA_4_0/source/setup/newuser	2006-05-09 03:50:32 UTC (rev 15518)
@@ -8,12 +8,12 @@
 
 options = GetOptions(ARGV,
 		"POPT_AUTOHELP",
+		'username=s',
+		'unixname=s',
+		'password=s',
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_VERSION",
 		"POPT_COMMON_CREDENTIALS",
-		'username=s',
-		'unixname=s',
-		'password=s',
 		'quiet');
 
 if (options == undefined) {
@@ -24,7 +24,6 @@
 libinclude("base.js");
 libinclude("provision.js");
 
-
 /*
   print a message if quiet is not set
 */
@@ -56,6 +55,7 @@
 if (options['username'] == undefined) {
 	ShowHelp();
 }
+
 if (options['password'] == undefined) {
 	random_init(local);
 	options.password = randpass(12);