sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-23 11:33:16 +03:00
Code Activity

Fix provision script to work without smb.conf location specified.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2008-03-11 14:41:10 +11:00
parent edb7af0685
commit b4da374a99
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/scripting/python/samba/provision.py
View File

@@ -51,7 +51,6 @@ class InvalidNetbiosName(Exception):
class ProvisionPaths: class ProvisionPaths:
def __init__(self): def __init__(self):
self.smbconf = None
self.shareconf = None self.shareconf = None
self.hklm = None self.hklm = None
self.hkcu = 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.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
paths.winsdb = os.path.join(paths.private_dir, "wins.ldb") paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi") 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, paths.phpldapadminconfig = os.path.join(paths.private_dir,
"phpldapadmin-config.php") "phpldapadmin-config.php")
paths.hklm = "hklm.ldb" paths.hklm = "hklm.ldb"
@@ -759,6 +757,9 @@ def provision(setup_dir, message, session_info,
if domainsid is None: if domainsid is None:
domainsid = security.random_sid() domainsid = security.random_sid()
else:
domainsid = security.Sid(domainsid)
if policyguid is None: if policyguid is None:
policyguid = uuid.random() policyguid = uuid.random()
if adminpass is None: if adminpass is None:

3
source/setup/provision
View File

@@ -27,6 +27,7 @@ import optparse
import os, sys import os, sys
import samba import samba
import param
from auth import system_session from auth import system_session
import samba.getopt as options import samba.getopt as options
@@ -110,7 +111,7 @@ if opts.realm is None or opts.domain is None:
parser.print_usage() parser.print_usage()
sys.exit(1) sys.exit(1)
smbconf = sambaopts.get_loadparm_path() smbconf = sambaopts.get_loadparm().configfile()
if opts.aci is not None: if opts.aci is not None:
print "set ACI: %s" % opts.aci print "set ACI: %s" % opts.aci