[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1197-gde1784e

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  de1784ec4d50f6eec24b1e9e488b5c07833dc1fd (commit)
       via  62536750ae06248a49c6b56c86d01b0062bb54f0 (commit)
      from  3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit de1784ec4d50f6eec24b1e9e488b5c07833dc1fd
Merge: 62536750ae06248a49c6b56c86d01b0062bb54f0 3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Mar 3 11:12:20 2008 +1100

    Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

commit 62536750ae06248a49c6b56c86d01b0062bb54f0
Author: Douglas VanLeuven <roamdad at sonic.net>
Date:   Mon Mar 3 11:08:59 2008 +1100

    Fix member server provision
    
    Can't add "member server" because the script aborts with null
    reference when no match on serverrole.  This is fixed by checking for
    the keyword "member server".

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

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


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 55935b0..e9aded2 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -830,7 +830,7 @@ def provision(lp, setup_dir, message, paths, session_info,
         message("Setting up smb.conf")
         if serverrole == "domain controller":
             smbconfsuffix = "dc"
-        elif serverrole == "member":
+        elif serverrole == "member server":
             smbconfsuffix = "member"
         setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
                    paths.smbconf, {


-- 
Samba Shared Repository