sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

r15518: the 'password' option in POPT_COMMON_CREDENTIALS was conflicting with

Browse Source 
the password option in newuser. Move the local options above the
global options to fix.
(This used to be commit 2adcd4ff4e)
This commit is contained in:
Andrew Tridgell
2006-05-09 03:50:32 +00:00
committed by Gerald (Jerry) Carter
parent 7947d4c425
commit 5196640c2c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/setup/newuser
View File

@ -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);