summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-10-20 02:13:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:01:56 -0500
commit883949679089e8ef78cda56bdb243484d6c60b87 (patch)
treef35f87b8915a8bbe661fcc5d78d97335c27b30dc
parent7afe85725f5581d7a74d7ec519bc45be549610ea (diff)
downloadsamba-883949679089e8ef78cda56bdb243484d6c60b87.tar.gz
samba-883949679089e8ef78cda56bdb243484d6c60b87.tar.bz2
samba-883949679089e8ef78cda56bdb243484d6c60b87.zip
r3078: Allow more things to be set as command line options to provision.
Andrew Bartlett (This used to be commit 2df85686f55049276eb60cbc3ca4bc1cfa9f7f0f)
-rwxr-xr-xsource4/script/provision.pl10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/script/provision.pl b/source4/script/provision.pl
index 326a7e60cf..4b51e9611b 100755
--- a/source4/script/provision.pl
+++ b/source4/script/provision.pl
@@ -41,7 +41,7 @@ sub randguid()
return sprintf("%08x-%04x-%04x-%04x-%08x%04x", $r1, $r2, $r3, $r4, $r5, $r6);
}
-my $domainguid = randguid();
+my $opt_domainguid = randguid();
my $hostguid = randguid();
sub randsid()
@@ -50,7 +50,7 @@ sub randsid()
int(rand(10**8)), int(rand(10**8)), int(rand(10**8)));
}
-my $domainsid = randsid();
+my $opt_domainsid = randsid();
# generate a random password. Poor algorithm :(
sub randpass()
@@ -82,7 +82,7 @@ sub substitute($)
}
if ($var eq "DOMAINSID") {
- return $domainsid;
+ return $opt_domainsid;
}
if ($var eq "DOMAIN") {
@@ -122,7 +122,7 @@ sub substitute($)
}
if ($var eq "DOMAINGUID") {
- return $domainguid;
+ return $opt_domainguid;
}
if ($var eq "HOSTGUID") {
@@ -246,6 +246,8 @@ GetOptions(
'help|h|?' => \$opt_help,
'realm=s' => \$opt_realm,
'domain=s' => \$opt_domain,
+ 'domain-guid=s' => \$opt_domainguid,
+ 'domain-sid=s' => \$opt_domainsid,
'hostname=s' => \$opt_hostname,
'hostip=s' => \$opt_hostip,
'adminpass=s' => \$opt_adminpass,