diff options
| author | Oliver Liebel <oliver@itc.li> | 2010-03-17 20:08:08 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-03-18 11:27:30 +1100 |
| commit | 15172d3055349ba1280d671a94794ccb1e787775 (patch) | |
| tree | d25215013b00c6306f9194411daf7724fc8608c8 | |
| parent | b05f0db957633454ad01598d084d883b8a3631fe (diff) | |
| download | samba-15172d3055349ba1280d671a94794ccb1e787775.tar.gz samba-15172d3055349ba1280d671a94794ccb1e787775.tar.bz2 samba-15172d3055349ba1280d671a94794ccb1e787775.zip | |
Fixed MMR-URL-Split and changed RID-Range OpenLDAP ITS6394
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/provisionbackend.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py index 1919c5d81c..e510486d8c 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"), |