diff options
author | Petr Viktorin <pviktori@redhat.com> | 2012-04-18 11:22:35 -0400 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-05-09 11:54:20 +0200 |
commit | f19218f7d87f5847d51f79b5d2850f90b0ae8407 (patch) | |
tree | 500d3101dc1375d3eb75ffb927040c2593216aa9 /install/tools | |
parent | c02fcf5d34ad880e082cbc0c7f59fc3812d11c9e (diff) | |
download | freeipa.git-f19218f7d87f5847d51f79b5d2850f90b0ae8407.tar.gz freeipa.git-f19218f7d87f5847d51f79b5d2850f90b0ae8407.tar.xz freeipa.git-f19218f7d87f5847d51f79b5d2850f90b0ae8407.zip |
Remove duplicate and unused utility code
IPA has some unused code from abandoned features (Radius, ipa 1.x user
input, commant-line tab completion), as well as some duplicate utilities.
This patch cleans up the utility modules.
Duplicate code consolidated into ipapython.ipautil:
{ipalib.util,ipaserver.ipautil,ipapython.ipautil}.realm_to_suffix
{ipaserver,ipapython}.ipautil.CIDict
(with style improvements from the ipaserver version)
{ipapython.entity,ipaserver.ipautil}.utf8_encode_value
{ipapython.entity,ipaserver.ipautil}.utf8_encode_values
ipalib.util.get_fqdn was removed in favor of the same function in
ipaserver.install.installutils
Removed unused code:
ipalib.util:
load_plugins_in_dir
import_plugins_subpackage
make_repr (was imported but unused; also removed from tests)
ipapython.ipautil:
format_list
parse_key_value_pairs
read_pairs_file
read_items_file
user_input_plain
AttributeValueCompleter
ItemCompleter
ipaserver.ipautil:
get_gsserror (a different version exists in ipapython.ipautil)
ipaserver.ipautil ended up empty and is removed entirely.
https://fedorahosted.org/freeipa/ticket/2650
Diffstat (limited to 'install/tools')
-rwxr-xr-x | install/tools/ipa-ca-install | 2 | ||||
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 4 | ||||
-rwxr-xr-x | install/tools/ipa-replica-install | 8 | ||||
-rwxr-xr-x | install/tools/ipa-replica-manage | 6 | ||||
-rwxr-xr-x | install/tools/ipa-replica-prepare | 2 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 9 |
6 files changed, 16 insertions, 15 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 57f867e7..55b4dbfb 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -143,7 +143,7 @@ def main(): # We need to ldap_enable the CA now that DS is up and running CA.ldap_enable('CA', config.host_name, config.dirman_password, - util.realm_to_suffix(config.realm_name)) + ipautil.realm_to_suffix(config.realm_name)) cs.add_simple_service('dogtagldap/%s@%s' % (config.host_name, config.realm_name)) cs.add_cert_to_service() diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 97c50455..938201fe 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -165,7 +165,7 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose): conn = ipaldap.IPAdmin(host, 636, cacert=CACERT) conn.do_simple_bind(bindpw=dirman_passwd) - dn = str(DN('cn=masters,cn=ipa,cn=etc,%s' % util.realm_to_suffix(realm))) + dn = str(DN('cn=masters,cn=ipa,cn=etc,%s' % ipautil.realm_to_suffix(realm))) entries = conn.search_s(dn, ldap.SCOPE_ONELEVEL) for ent in entries: @@ -316,7 +316,7 @@ def add_link(realm, replica1, replica2, dirman_passwd, options): conn = ipaldap.IPAdmin(replica2, 636, cacert=CACERT) conn.do_simple_bind(bindpw=dirman_passwd) - dn = str(DN('cn=CA,cn=%s,cn=masters,cn=ipa,cn=etc,%s' % (replica2, util.realm_to_suffix(realm)))) + dn = str(DN('cn=CA,cn=%s,cn=masters,cn=ipa,cn=etc,%s' % (replica2, ipautil.realm_to_suffix(realm)))) conn.search_s(dn, ldap.SCOPE_ONELEVEL) conn.unbind_s() except ldap.NO_SUCH_OBJECT: diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 07b1781e..39ce09bf 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -186,7 +186,7 @@ def install_http(config, auto_redirect): config.dir + "/http_pin.txt") memcache = memcacheinstance.MemcacheInstance() - memcache.create_instance('MEMCACHE', config.host_name, config.dirman_password, util.realm_to_suffix(config.realm_name)) + memcache.create_instance('MEMCACHE', config.host_name, config.dirman_password, ipautil.realm_to_suffix(config.realm_name)) http = httpinstance.HTTPInstance() http.create_instance(config.realm_name, config.host_name, config.domain_name, config.dirman_password, False, pkcs12_info, self_signed_ca=True, auto_redirect=auto_redirect) @@ -236,7 +236,7 @@ def install_bind(config, options): def install_dns_records(config, options): if not bindinstance.dns_container_exists(config.master_host_name, - util.realm_to_suffix(config.realm_name), + ipautil.realm_to_suffix(config.realm_name), dm_password=config.dirman_password): return @@ -355,7 +355,7 @@ def main(): fd = open("/etc/ipa/default.conf", "w") fd.write("[global]\n") fd.write("host=" + config.host_name + "\n") - fd.write("basedn=" + util.realm_to_suffix(config.realm_name) + "\n") + fd.write("basedn=" + ipautil.realm_to_suffix(config.realm_name) + "\n") fd.write("realm=" + config.realm_name + "\n") fd.write("domain=" + config.domain_name + "\n") fd.write("xmlrpc_uri=https://%s/ipa/xml\n" % ipautil.format_netloc(config.host_name)) @@ -434,7 +434,7 @@ def main(): # We need to ldap_enable the CA now that DS is up and running if CA and config.setup_ca: CA.ldap_enable('CA', config.host_name, config.dirman_password, - util.realm_to_suffix(config.realm_name)) + ipautil.realm_to_suffix(config.realm_name)) cs.add_simple_service('dogtagldap/%s@%s' % (config.host_name, config.realm_name)) cs.add_cert_to_service() diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index f1f5425c..e2378173 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -126,13 +126,13 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose): else: conn.do_sasl_gssapi_bind() - dn = 'cn=masters,cn=ipa,cn=etc,%s' % util.realm_to_suffix(realm) + dn = 'cn=masters,cn=ipa,cn=etc,%s' % ipautil.realm_to_suffix(realm) entries = conn.search_s(dn, ldap.SCOPE_ONELEVEL) for ent in entries: peers[ent.cn] = ['master', ''] - dn = 'cn=replicas,cn=ipa,cn=etc,%s' % util.realm_to_suffix(realm) + dn = 'cn=replicas,cn=ipa,cn=etc,%s' % ipautil.realm_to_suffix(realm) entries = conn.search_s(dn, ldap.SCOPE_ONELEVEL) for ent in entries: @@ -255,7 +255,7 @@ def del_link(realm, replica1, replica2, dirman_passwd, force=False): if type1 == replication.WINSYNC: try: dn = 'cn=%s,cn=replicas,cn=ipa,cn=etc,%s' % (replica2, - util.realm_to_suffix(realm)) + ipautil.realm_to_suffix(realm)) entries = repl1.conn.search_s(dn, ldap.SCOPE_SUBTREE) if len(entries) != 0: dnset = repl1.conn.get_dns_sorted_by_length(entries, diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index c54aa62b..3b691128 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -307,7 +307,7 @@ def main(): enable_replication_version_checking(api.env.host, api.env.realm, dirman_password) - subject_base = get_subject_base(api.env.host, dirman_password, util.realm_to_suffix(api.env.realm)) + subject_base = get_subject_base(api.env.host, dirman_password, ipautil.realm_to_suffix(api.env.realm)) top_dir = tempfile.mkdtemp("ipa") dir = top_dir + "/realm_info" diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 1dd02ba8..f3377df6 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -57,6 +57,7 @@ from ipaserver.plugins.ldap2 import ldap2 from ipapython import sysrestore from ipapython.ipautil import * +from ipapython import ipautil from ipalib import api, errors, util from ipapython.config import IPAOptionParser from ipalib.dn import DN @@ -812,7 +813,7 @@ def main(): fd = open(target_fname, "w") fd.write("[global]\n") fd.write("host=" + host_name + "\n") - fd.write("basedn=" + util.realm_to_suffix(realm_name) + "\n") + fd.write("basedn=" + ipautil.realm_to_suffix(realm_name) + "\n") fd.write("realm=" + realm_name + "\n") fd.write("domain=" + domain_name + "\n") fd.write("xmlrpc_uri=https://%s/ipa/xml\n" % format_netloc(host_name)) @@ -938,7 +939,7 @@ def main(): # We need to ldap_enable the CA now that DS is up and running if not options.selfsign: ca.ldap_enable('CA', host_name, dm_password, - util.realm_to_suffix(realm_name)) + ipautil.realm_to_suffix(realm_name)) # Turn on SSL in the dogtag LDAP instance. This will get restarted # later, we don't need SSL now. @@ -984,7 +985,7 @@ def main(): os.close(pw_fd) memcache = memcacheinstance.MemcacheInstance() - memcache.create_instance('MEMCACHE', host_name, dm_password, util.realm_to_suffix(realm_name)) + memcache.create_instance('MEMCACHE', host_name, dm_password, ipautil.realm_to_suffix(realm_name)) http = httpinstance.HTTPInstance(fstore) if options.http_pkcs12: @@ -995,7 +996,7 @@ def main(): http.create_instance(realm_name, host_name, domain_name, dm_password, autoconfig=True, self_signed_ca=options.selfsign, subject_base=options.subject, auto_redirect=options.ui_redirect) ipaservices.restore_context("/var/cache/ipa/sessions") - set_subject_in_config(realm_name, dm_password, util.realm_to_suffix(realm_name), options.subject) + set_subject_in_config(realm_name, dm_password, ipautil.realm_to_suffix(realm_name), options.subject) # Apply any LDAP updates. Needs to be done after the configuration file # is created |