summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-11 14:41:10 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-11 14:41:10 +1100
commit9703948850fb6febb237d701ce6b6300e9df8e1f (patch)
tree93e76c3ca32d42dcaa594d1d36ba90ae520f32a0 /source4/scripting
parentb5a5fcdc62f56b38f8f141bb4b5377239f07a25f (diff)
downloadsamba-9703948850fb6febb237d701ce6b6300e9df8e1f.tar.gz
samba-9703948850fb6febb237d701ce6b6300e9df8e1f.tar.bz2
samba-9703948850fb6febb237d701ce6b6300e9df8e1f.zip
Fix provision script to work without smb.conf location specified.
Andrew Bartlett (This used to be commit b4da374a998caac18c288a0a6e3fcd2c50cbffa7)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ebca1f8e40..24870c2fbd 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -51,7 +51,6 @@ class InvalidNetbiosName(Exception):
class ProvisionPaths:
def __init__(self):
- self.smbconf = None
self.shareconf = None
self.hklm = None
self.hkcu = None
@@ -217,7 +216,6 @@ def provision_paths_from_lp(lp, dnsdomain):
paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
- paths.smbconf = os.path.join(paths.private_dir, "smb.conf")
paths.phpldapadminconfig = os.path.join(paths.private_dir,
"phpldapadmin-config.php")
paths.hklm = "hklm.ldb"
@@ -759,6 +757,9 @@ def provision(setup_dir, message, session_info,
if domainsid is None:
domainsid = security.random_sid()
+ else:
+ domainsid = security.Sid(domainsid)
+
if policyguid is None:
policyguid = uuid.random()
if adminpass is None: