summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorPavel Zuna <pzuna@redhat.com>2011-02-07 12:52:07 -0500
committerRob Crittenden <rcritten@redhat.com>2011-02-10 11:16:57 -0500
commit46dbf0ae55f808a600b60dc45e0fccebcdc5ba99 (patch)
tree06935fac62762bb63fe75484c601799b0b3ccaf8 /ipaserver
parentacc437c5fe4b90493e0481fbc2502b40254f5475 (diff)
downloadfreeipa-46dbf0ae55f808a600b60dc45e0fccebcdc5ba99.tar.gz
freeipa-46dbf0ae55f808a600b60dc45e0fccebcdc5ba99.tar.xz
freeipa-46dbf0ae55f808a600b60dc45e0fccebcdc5ba99.zip
Fix crash in DNS installer.
Fix #927
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/bindinstance.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 1f35dc1f..8790427c 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -156,7 +156,7 @@ def add_reverse_zone(ip_address, update_policy=None, dns_backup=None):
return zone
def add_rr(zone, name, type, rdata, dns_backup=None, **kwargs):
- addkw = { '%srecord' % unicode(type.lower()) : unicode(rdata) }
+ addkw = { '%srecord' % str(type.lower()) : unicode(rdata) }
addkw.update(kwargs)
try:
api.Command.dnsrecord_add(unicode(zone), unicode(name), **addkw)
@@ -177,7 +177,7 @@ def add_ptr_rr(ip_address, fqdn, dns_backup=None):
add_rr(zone, name, "PTR", fqdn+".", dns_backup)
def del_rr(zone, name, type, rdata):
- delkw = { '%srecord' % unicode(type.lower()) : unicode(rdata) }
+ delkw = { '%srecord' % str(type.lower()) : unicode(rdata) }
try:
api.Command.dnsrecord_del(unicode(zone), unicode(name), **delkw)
except (errors.NotFound, errors.EmptyModlist):
@@ -232,7 +232,7 @@ class DnsBackup(object):
if have_ldap:
type, host, rdata = dns_record.split(" ", 2)
try:
- delkw = { '%srecord' % unicode(type.lower()) : unicode(rdata) }
+ delkw = { '%srecord' % str(type.lower()) : unicode(rdata) }
api.Command.dnsrecord_del(unicode(zone), unicode(host), **delkw)
except:
pass