Use ldap2 instead of legacy LDAP code from v1 in installer scripts.

This commit is contained in:
Pavel Zuna
2010-03-24 15:51:31 +01:00
committed by Rob Crittenden
parent cc336cf9c1
commit 3620135ec9
11 changed files with 144 additions and 148 deletions

View File

@@ -24,10 +24,9 @@ import traceback, logging
from ipapython import ipautil
from ipaserver.install import replication, dsinstance, installutils
from ipaserver import ipaldap
from ipaserver.plugins.ldap2 import ldap2
from ipapython import version
from ipalib import util
from ipalib import errors
from ipalib import errors, util
def parse_options():
from optparse import OptionParser
@@ -73,7 +72,8 @@ def get_realm_name():
return c.default_realm
def get_suffix():
suffix = ipaldap.IPAdmin.normalizeDN(util.realm_to_suffix(get_realm_name()))
l = ldap2(shared_instance=False, base_dn='')
suffix = l.normalize_dn(util.realm_to_suffix(get_realm_name()))
return suffix
def get_host_name():