From 8be8d4ebfd876aba109ea133efe11d2386564f3b Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 21 Jan 2013 06:43:29 -0500 Subject: Remove dbdir, binddn, bindpwd from IPAdmin The dbdir logic was moved to replication.py, the only caller. The binddn and bindpwd attributes were unused. Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/replication.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ipaserver/install') diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index c28fa890..1555fb99 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -19,6 +19,7 @@ import time import sys +import os import ldap @@ -355,12 +356,19 @@ class ReplicationManager(object): conn.addEntry(entry) def setup_changelog(self, conn): + ent = conn.get_entry( + DN( + ('cn', 'config'), ('cn', 'ldbm database'), + ('cn', 'plugins'), ('cn', 'config')), + ['nsslapd-directory']) + dbdir = os.path.dirname(ent.getValue('nsslapd-directory')) + entry = conn.make_entry( DN(('cn', 'changelog5'), ('cn', 'config')), { 'objectclass': ["top", "extensibleobject"], 'cn': ["changelog5"], - 'nsslapd-changelogdir': [conn.dbdir + "/cldb"], + 'nsslapd-changelogdir': [os.path.join(dbdir, "cldb")], } ) try: -- cgit