[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  1077337 torture: Suggest torture_fail() / torture_result().
       via  7ed9eba provision: remove reference to no longer existing template files.
      from  86b1dd8 s4-samba-tool: make new samba-tool group listmembers use samAccountName

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1077337afb7fd62b8d9aa4bfb1b95e7a1104e3da
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 3 13:42:57 2012 +0200

    torture: Suggest torture_fail() / torture_result().
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Thu May  3 15:31:06 CEST 2012 on sn-devel-104

commit 7ed9ebab83f1883d09bee742d81e8d2308da1bfe
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Apr 26 20:08:04 2012 +0200

    provision: remove reference to no longer existing template files.

-----------------------------------------------------------------------

Summary of changes:
 lib/torture/torture.c                              |    3 ++-
 .../scripting/python/samba/provision/__init__.py   |   12 +++++-------
 source4/setup/wscript_build                        |    3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index cee6bdb..a2799ef 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -443,7 +443,8 @@ static bool internal_torture_run_test(struct torture_context *context,
 
 	    if (!success && context->last_result == TORTURE_OK) {
 		    if (context->last_reason == NULL)
-			    context->last_reason = talloc_strdup(context, "Unknown error/failure");
+			    context->last_reason = talloc_strdup(context,
+					"Unknown error/failure. Missing torture_fail() or torture_result() call?");
 		    context->last_result = TORTURE_ERROR;
 	    }
 	}
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index d84a0f8..a60c05a 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 3558682..2513f28 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)
 


-- 
Samba Shared Repository