diff options
| author | Howard Chu <hyc@symas.com> | 2013-09-16 14:14:10 -0700 |
|---|---|---|
| committer | Nadezhda Ivanova <nivanova@samba.org> | 2013-09-17 05:56:56 +0200 |
| commit | dcbd4ede2f320df9264a138685a2214bfa1ef6a1 (patch) | |
| tree | 5abae01b423930bbb728b447daa1a0a59496411a /python/samba | |
| parent | f2bccebd913f023e3d99282be4e831d012cd3578 (diff) | |
| download | samba-dcbd4ede2f320df9264a138685a2214bfa1ef6a1.tar.gz samba-dcbd4ede2f320df9264a138685a2214bfa1ef6a1.tar.xz samba-dcbd4ede2f320df9264a138685a2214bfa1ef6a1.zip | |
Fix OpenLDAP partition configs
Update to use LMDB backend, BDB is deprecated
Update to support DomainDNSZones and ForestDNSZones partitions.
Signed-off-by: Howard Chu <hyc@symas.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba')
| -rw-r--r-- | python/samba/provision/backend.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py index b50055de9f..58aab9829f 100644 --- a/python/samba/provision/backend.py +++ b/python/samba/provision/backend.py @@ -417,6 +417,8 @@ class OpenLDAPBackend(LDAPBackend): mmr_serverids_config = "" mmr_syncrepl_schema_config = "" mmr_syncrepl_config_config = "" + mmr_syncrepl_domaindns_config = "" + mmr_syncrepl_forestdns_config = "" mmr_syncrepl_user_config = "" if self.ol_mmr_urls is not None: @@ -456,6 +458,22 @@ class OpenLDAPBackend(LDAPBackend): "MMR_PASSWORD": mmr_pass}) rid = rid + 1 + mmr_syncrepl_domaindns_config += read_and_sub_file( + setup_path("mmr_syncrepl.conf"), { + "RID" : str(rid), + "MMRDN": "dc=DomainDNSZones," + self.names.domaindn, + "LDAPSERVER" : url, + "MMR_PASSWORD": mmr_pass}) + + rid = rid + 1 + mmr_syncrepl_forestdns_config += read_and_sub_file( + setup_path("mmr_syncrepl.conf"), { + "RID" : str(rid), + "MMRDN": "dc=ForestDNSZones," + self.names.domaindn, + "LDAPSERVER" : url, + "MMR_PASSWORD": mmr_pass}) + + rid = rid + 1 mmr_syncrepl_user_config += read_and_sub_file( setup_path("mmr_syncrepl.conf"), { "RID" : str(rid), @@ -508,6 +526,8 @@ class OpenLDAPBackend(LDAPBackend): "MMR_SERVERIDS_CONFIG": mmr_serverids_config, "MMR_SYNCREPL_SCHEMA_CONFIG": mmr_syncrepl_schema_config, "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config, + "MMR_SYNCREPL_DOMAINDNS_CONFIG": mmr_syncrepl_domaindns_config, + "MMR_SYNCREPL_FORESTDNS_CONFIG": mmr_syncrepl_forestdns_config, "MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config, "OLC_SYNCREPL_CONFIG": olc_syncrepl_config, "OLC_MMR_CONFIG": olc_mmr_config, @@ -515,6 +535,8 @@ class OpenLDAPBackend(LDAPBackend): "INDEX_CONFIG": index_config, "NOSYNC": nosync_config}) + self.setup_db_config(os.path.join(self.ldapdir, "db", "forestdns")) + self.setup_db_config(os.path.join(self.ldapdir, "db", "domaindns")) self.setup_db_config(os.path.join(self.ldapdir, "db", "user")) self.setup_db_config(os.path.join(self.ldapdir, "db", "config")) self.setup_db_config(os.path.join(self.ldapdir, "db", "schema")) |