summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-04-26 20:08:04 +0200
committerJelmer Vernooij <jelmer@samba.org>2012-05-03 13:41:24 +0200
commit7ed9ebab83f1883d09bee742d81e8d2308da1bfe (patch)
tree9f442e12b0f9d15989d0942b35f9844c7fdfd057
parent86b1dd845a595bd6f3a70176a155ee0187584a5e (diff)
downloadsamba-7ed9ebab83f1883d09bee742d81e8d2308da1bfe.tar.gz
samba-7ed9ebab83f1883d09bee742d81e8d2308da1bfe.tar.bz2
samba-7ed9ebab83f1883d09bee742d81e8d2308da1bfe.zip
provision: remove reference to no longer existing template files.
-rw-r--r--source4/scripting/python/samba/provision/__init__.py12
-rw-r--r--source4/setup/wscript_build3
2 files changed, 6 insertions, 9 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index d84a0f87fc..a60c05a677 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -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))
diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index 35586828fc..2513f28af7 100644
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -13,7 +13,6 @@ bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
bld.INSTALL_FILES('${SETUPDIR}', 'spn_update_list')
for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
- named.conf named.conf.update named.conf.dlz provision.smb.conf.dc
- provision.smb.conf.member provision.smb.conf.standalone'''.split():
+ named.conf named.conf.update named.conf.dlz'''.split():
bld.INSTALL_WILDCARD('${SETUPDIR}', p)