diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 23:05:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 23:05:35 +0100 |
| commit | 2227860a793dbde0b41e6ba1a720ac0d161ad784 (patch) | |
| tree | 31e9701e978e4355362c199863d11ce52c04d5db /source4/scripting/python/samba/provision.py | |
| parent | d75c51eef34836f9eb5fa3449cef31f6463ce470 (diff) | |
| download | samba-2227860a793dbde0b41e6ba1a720ac0d161ad784.tar.gz samba-2227860a793dbde0b41e6ba1a720ac0d161ad784.tar.xz samba-2227860a793dbde0b41e6ba1a720ac0d161ad784.zip | |
Fix more tests, improve repr() functions for various Python types.
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 9cd5c0e162c..150e5c00df8 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -80,6 +80,7 @@ class ProvisionPaths(object): self.olmmrserveridsconf = None self.olmmrsyncreplconf = None + class ProvisionNames(object): def __init__(self): self.rootdn = None @@ -362,7 +363,8 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, default_lp = param.LoadParm() #Load non-existant file - default_lp.load(smbconf) + if os.path.exists(smbconf): + default_lp.load(smbconf) if targetdir is not None: privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private")) @@ -920,8 +922,6 @@ 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 = str(uuid.uuid4()) |