summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipa-client/ipaclient/Makefile.am1
-rw-r--r--ipa-client/ipaclient/__init__.py2
-rw-r--r--ipa-client/ipaclient/ipadiscovery.py14
-rw-r--r--ipa-python/MANIFEST.in2
-rw-r--r--ipa-python/dnsclient.py (renamed from ipa-client/ipaclient/dnsclient.py)0
5 files changed, 9 insertions, 10 deletions
diff --git a/ipa-client/ipaclient/Makefile.am b/ipa-client/ipaclient/Makefile.am
index 038238926..290ffef8d 100644
--- a/ipa-client/ipaclient/Makefile.am
+++ b/ipa-client/ipaclient/Makefile.am
@@ -3,7 +3,6 @@ NULL =
appdir = $(IPA_DATA_DIR)/ipaclient
app_PYTHON = \
__init__.py \
- dnsclient.py \
ipachangeconf.py \
ipadiscovery.py \
ntpconf.py \
diff --git a/ipa-client/ipaclient/__init__.py b/ipa-client/ipaclient/__init__.py
index c07a549a5..ba14d3c4c 100644
--- a/ipa-client/ipaclient/__init__.py
+++ b/ipa-client/ipaclient/__init__.py
@@ -18,5 +18,5 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-__all__ = ["ipadiscovery", "ipachangeconf", "dnsclient"]
+__all__ = ["ipadiscovery", "ipachangeconf"]
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)
diff --git a/ipa-python/MANIFEST.in b/ipa-python/MANIFEST.in
index 49f2126a6..e2cad6f22 100644
--- a/ipa-python/MANIFEST.in
+++ b/ipa-python/MANIFEST.in
@@ -1,3 +1,3 @@
include *.conf
-include freeipa-python.spec*
+include ipa-python.spec*
diff --git a/ipa-client/ipaclient/dnsclient.py b/ipa-python/dnsclient.py
index bc8a229cd..bc8a229cd 100644
--- a/ipa-client/ipaclient/dnsclient.py
+++ b/ipa-python/dnsclient.py