mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
Fix provision script to work without smb.conf location specified.
Andrew Bartlett
(This used to be commit b4da374a99
)
This commit is contained in:
parent
b5a5fcdc62
commit
9703948850
@ -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:
|
||||
|
@ -27,6 +27,7 @@ import optparse
|
||||
import os, sys
|
||||
|
||||
import samba
|
||||
import param
|
||||
|
||||
from auth import system_session
|
||||
import samba.getopt as options
|
||||
@ -110,7 +111,7 @@ if opts.realm is None or opts.domain is None:
|
||||
parser.print_usage()
|
||||
sys.exit(1)
|
||||
|
||||
smbconf = sambaopts.get_loadparm_path()
|
||||
smbconf = sambaopts.get_loadparm().configfile()
|
||||
|
||||
if opts.aci is not None:
|
||||
print "set ACI: %s" % opts.aci
|
||||
|
Loading…
Reference in New Issue
Block a user