provision: remove reference to no longer existing template files.

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index d84a0f87fc9a88bab41a6dde4a64f87517ed4956..a60c05a67788daf9dd25be8b89849e9f59e7ed14 100644 (file)
--- 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 35586828fca1a0ce02037c9a4b6c2d5d2f0521f2..2513f28af7137c72a1e3b2b9fd693b47e1c7a24d 100644 (file)
--- 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)