[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-627-g62ab39d

[Jelmer Vernooij]

The branch, master has been updated
       via  62ab39dde37f5570b336b9db5b4e3c2e4640e877 (commit)
      from  960b75531530c05fcaaa7400e52f2b688a6e8d88 (commit)

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


- Log -----------------------------------------------------------------
commit 62ab39dde37f5570b336b9db5b4e3c2e4640e877
Author: Matthias Dieter Wallnoefer <mwallnoefer at yahoo.de>
Date:   Sat Mar 21 03:07:00 2009 +0100

    s4/provision: Use existing serverrole variable.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>

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

Summary of changes:
 source4/scripting/python/samba/provision.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d968576..896f237 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1056,7 +1056,7 @@ def provision(setup_dir, message, session_info,
                         serverrole=serverrole, ldap_backend=ldap_backend, 
                         ldap_backend_type=ldap_backend_type)
 
-    if lp.get("server role") == "domain controller":
+    if serverrole == "domain controller":
         if paths.netlogon is None:
             message("Existing smb.conf does not have a [netlogon] share, but you are configuring a DC.")
             message("Please either remove %s or see the template at %s" % 


-- 
Samba Shared Repository