summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-05-09 03:50:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:45 -0500
commit5196640c2c81fed284d4fee8ce13ebf1da467cdd (patch)
tree549b60a7a9350aa5227b1b10d59ee49e7367fe76 /source4/setup
parent7947d4c425e72fea9acfe68bd9d6e28011dc0065 (diff)
downloadsamba-5196640c2c81fed284d4fee8ce13ebf1da467cdd.tar.gz
samba-5196640c2c81fed284d4fee8ce13ebf1da467cdd.tar.bz2
samba-5196640c2c81fed284d4fee8ce13ebf1da467cdd.zip
r15518: 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. (This used to be commit 2adcd4ff4ec1ef867b91274d994c39e7c0fdaad2)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/newuser8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/setup/newuser b/source4/setup/newuser
index 4d2acf5373..7c80e9e8de 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -8,12 +8,12 @@ exec smbscript "$0" ${1+"$@"}
options = GetOptions(ARGV,
"POPT_AUTOHELP",
- "POPT_COMMON_SAMBA",
- "POPT_COMMON_VERSION",
- "POPT_COMMON_CREDENTIALS",
'username=s',
'unixname=s',
'password=s',
+ "POPT_COMMON_SAMBA",
+ "POPT_COMMON_VERSION",
+ "POPT_COMMON_CREDENTIALS",
'quiet');
if (options == undefined) {
@@ -24,7 +24,6 @@ if (options == undefined) {
libinclude("base.js");
libinclude("provision.js");
-
/*
print a message if quiet is not set
*/
@@ -56,6 +55,7 @@ You must provide at least a username
if (options['username'] == undefined) {
ShowHelp();
}
+
if (options['password'] == undefined) {
random_init(local);
options.password = randpass(12);