diff options
author | Simo Sorce <ssorce@redhat.com> | 2007-12-10 16:31:21 -0500 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2007-12-10 16:31:21 -0500 |
commit | c0b809efd5c9ad71cce834d1080cc40eb0c781d4 (patch) | |
tree | 01697ad7511d0f6a97c789ed425a2a120bf1c8f5 /ipa-client/ipaclient/ipadiscovery.py | |
parent | f169641aae82cf8e96cd2296a4ba61d67548623c (diff) | |
download | freeipa-c0b809efd5c9ad71cce834d1080cc40eb0c781d4.tar.gz freeipa-c0b809efd5c9ad71cce834d1080cc40eb0c781d4.tar.xz freeipa-c0b809efd5c9ad71cce834d1080cc40eb0c781d4.zip |
Move dnsclient into ipa-python so that I will be able to use it in ipaconfig
Diffstat (limited to 'ipa-client/ipaclient/ipadiscovery.py')
-rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index 6f44ffd1b..939d41056 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -20,7 +20,7 @@ import socket import logging -import dnsclient +import ipa.dnsclient import ldap from ldap import LDAPError @@ -191,10 +191,10 @@ class IPADiscovery: # terminate the name if not qname.endswith("."): qname += "." - results = dnsclient.query(qname, dnsclient.DNS_C_IN, dnsclient.DNS_T_SRV) + results = ipa.dnsclient.query(qname, ipa.dnsclient.DNS_C_IN, ipa.dnsclient.DNS_T_SRV) for result in results: - if result.dns_type == dnsclient.DNS_T_SRV: + if result.dns_type == ipa.dnsclient.DNS_T_SRV: rserver = result.rdata.server.rstrip(".") if result.rdata.port and result.rdata.port != 389: rserver += ":" + str(result.rdata.port) @@ -214,10 +214,10 @@ class IPADiscovery: # terminate the name if not qname.endswith("."): qname += "." - results = dnsclient.query(qname, dnsclient.DNS_C_IN, dnsclient.DNS_T_TXT) + results = ipa.dnsclient.query(qname, ipa.dnsclient.DNS_C_IN, ipa.dnsclient.DNS_T_TXT) for result in results: - if result.dns_type == dnsclient.DNS_T_TXT: + if result.dns_type == ipa.dnsclient.DNS_T_TXT: realm = result.rdata.data if realm: break @@ -228,9 +228,9 @@ class IPADiscovery: # terminate the name if not qname.endswith("."): qname += "." - results = dnsclient.query(qname, dnsclient.DNS_C_IN, dnsclient.DNS_T_SRV) + results = ipa.dnsclient.query(qname, ipa.dnsclient.DNS_C_IN, ipa.dnsclient.DNS_T_SRV) for result in results: - if result.dns_type == dnsclient.DNS_T_SRV: + if result.dns_type == ipa.dnsclient.DNS_T_SRV: qname = result.rdata.server.rstrip(".") if result.rdata.port and result.rdata.port != 88: qname += ":" + str(result.rdata.port) |