sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

provision: remove reference to no longer existing template files.

Browse Source
This commit is contained in:
Jelmer Vernooij
2012-04-26 20:08:04 +02:00
parent 86b1dd845a
commit 7ed9ebab83
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/provision/__init__.py
View File

@ -1796,12 +1796,10 @@ def provision(logger, session_info, credentials, smbconf=None,
if serverrole == "domain controller":
if paths.netlogon is None:
raise MissingShareError("netlogon", paths.smbconf,
setup_path("provision.smb.conf.dc"))
raise MissingShareError("netlogon", paths.smbconf)
if paths.sysvol is None:
raise MissingShareError("sysvol", paths.smbconf,
setup_path("provision.smb.conf.dc"))
raise MissingShareError("sysvol", paths.smbconf)
if not os.path.isdir(paths.netlogon):
os.makedirs(paths.netlogon, 0755)
@ -1947,8 +1945,8 @@ class InvalidNetbiosName(Exception):
class MissingShareError(ProvisioningError):
def __init__(self, name, smbconf, smbconf_template):
def __init__(self, name, smbconf):
super(MissingShareError, self).__init__(
"Existing smb.conf does not have a [%s] share, but you are "
"configuring a DC. Please either remove %s or see the template "
"at %s" % (name, smbconf, smbconf_template))
"configuring a DC. Please remove %s or add the share manually." %
(name, smbconf))