[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  752b220... Fixed --ol-mmr-url helpline
       via  947560f... Fixed OL-MMR make test
       via  15172d3... Fixed MMR-URL-Split and changed RID-Range OpenLDAP ITS6394
      from  b05f0db... s4-smbtorture: fix typo in RPC-SAMR-PASSWORDS-LOCKOUT test.

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


- Log -----------------------------------------------------------------
commit 752b2206cbb411e98e88efcfd1df9876a79d4a3d
Author: Oliver Liebel <oliver at itc.li>
Date:   Wed Mar 17 20:11:11 2010 +0100

    Fixed --ol-mmr-url helpline
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit 947560fe3754185cd6edf7e1cd7e5c5fe405fa39
Author: Oliver Liebel <oliver at itc.li>
Date:   Wed Mar 17 20:14:19 2010 +0100

    Fixed OL-MMR make test
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit 15172d3055349ba1280d671a94794ccb1e787775
Author: Oliver Liebel <oliver at itc.li>
Date:   Wed Mar 17 20:08:08 2010 +0100

    Fixed MMR-URL-Split and changed RID-Range OpenLDAP ITS6394
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source4/scripting/python/samba/provisionbackend.py |   18 ++++++++++--------
 source4/setup/provision                            |    2 +-
 source4/setup/tests/blackbox_provision-backend.sh  |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 1919c5d..e510486 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -356,15 +356,17 @@ class OpenLDAPBackend(LDAPBackend):
             # For now, make these equal
             mmr_pass = self.ldapadminpass
         
-            url_list=filter(None,self.ol_mmr_urls.split(' ')) 
+            url_list=filter(None,self.ol_mmr_urls.split(','))
+            for url in url_list:
+                self.message("Using LDAP-URL: "+url)
             if (len(url_list) == 1):
-                url_list=filter(None,self.ol_mmr_urls.split(',')) 
-                     
+                raise ProvisioningError("At least 2 LDAP-URLs needed for MMR!")
+
             
-                mmr_on_config = "MirrorMode On"
-                mmr_replicator_acl = "  by dn=cn=replicator,cn=samba read"
-                serverid=0
-                for url in url_list:
+            mmr_on_config = "MirrorMode On"
+            mmr_replicator_acl = "  by dn=cn=replicator,cn=samba read"
+            serverid=0
+            for url in url_list:
                     serverid=serverid+1
                     mmr_serverids_config += read_and_sub_file(self.setup_path("mmr_serverids.conf"),
                                                           { "SERVERID" : str(serverid),
@@ -400,7 +402,7 @@ class OpenLDAPBackend(LDAPBackend):
             olc_serverids_config = ""
             olc_syncrepl_seed_config = ""
             olc_mmr_config += read_and_sub_file(self.setup_path("olc_mmr.conf"),{})
-            rid=1000
+            rid=500
             for url in url_list:
                 serverid=serverid+1
                 olc_serverids_config += read_and_sub_file(self.setup_path("olc_serverid.conf"),
diff --git a/source4/setup/provision b/source4/setup/provision
index a04bc2a..9932759 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -109,7 +109,7 @@ parser.add_option("--partitions-only",
 parser.add_option("--targetdir", type="string", metavar="DIR", 
 		          help="Set target directory")
 parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER",
-                help="List of LDAP-URLS [ ldap://<FQHN>:<PORT>/  (where <PORT> has to be different than 389!) ] separated with whitespaces for use with OpenLDAP-MMR (Multi-Master-Replication)")
+                help="List of LDAP-URLS [ ldap://<FQHN>:<PORT>/  (where <PORT> has to be different than 389!) ] separated with comma (\",\") for use with OpenLDAP-MMR (Multi-Master-Replication), e.g.: \"ldap://s4dc1:9000,ldap://s4dc2:9000\"")
 parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH", 
 		help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.") 
 parser.add_option("--setup-ds-path", type="string", metavar="SETUP_DS-PATH", 
diff --git a/source4/setup/tests/blackbox_provision-backend.sh b/source4/setup/tests/blackbox_provision-backend.sh
index 305c87a..ef7819f 100755
--- a/source4/setup/tests/blackbox_provision-backend.sh
+++ b/source4/setup/tests/blackbox_provision-backend.sh
@@ -13,7 +13,7 @@ shift 1
 . `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 testit "openldap-backend" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --ldap-dryrun-mode --slapd-path=/dev/null
-testit "openldap-mmr-backend" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls='ldap://localdc1:9000,ldap://localdc2:9000,ldap://localdc3:9000' --ldap-dryrun-mode --slapd-path=/dev/null
+testit "openldap-mmr-backend" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --ldap-dryrun-mode --slapd-path=/dev/null --username=samba-admin --password=linux --adminpass=linux --ldapadminpass=linux
 testit "fedora-ds-backend" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --ldap-dryrun-mode --slapd-path=/dev/null
 
 reprovision() {


-- 
Samba Shared Repository