svn commit: samba r3078 - in branches/SAMBA_4_0/source/script: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-10-20 02:13:45 +0000 (Wed, 20 Oct 2004)
New Revision: 3078

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/script&rev=3078&nolog=1

Log:
Allow more things to be set as command line options to provision.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/provision.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/provision.pl
===================================================================
--- branches/SAMBA_4_0/source/script/provision.pl	2004-10-20 02:12:52 UTC (rev 3077)
+++ branches/SAMBA_4_0/source/script/provision.pl	2004-10-20 02:13:45 UTC (rev 3078)
@@ -41,7 +41,7 @@
 	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 @@
 		       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 @@
 	}
 
 	if ($var eq "DOMAINSID") {
-		return $domainsid;
+		return $opt_domainsid;
 	}
 
 	if ($var eq "DOMAIN") {
@@ -122,7 +122,7 @@
 	}
 
 	if ($var eq "DOMAINGUID") {
-		return $domainguid;
+		return $opt_domainguid;
 	}
 
 	if ($var eq "HOSTGUID") {
@@ -246,6 +246,8 @@
 	    '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,