summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/ldapupdate.py
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2015-03-17 16:53:44 +0100
committerPetr Vobornik <pvoborni@redhat.com>2015-04-14 19:25:47 +0200
commitb4ca5c57d230c80ecc4f8eaaa01d8e7a36bcb3b4 (patch)
tree8f9bcdc11e75c58c4b741deb6e44d48f28938a66 /ipaserver/install/ldapupdate.py
parent13c4631813b7e8ac4afc8d5f350ef136c7107d89 (diff)
downloadfreeipa-b4ca5c57d230c80ecc4f8eaaa01d8e7a36bcb3b4.tar.gz
freeipa-b4ca5c57d230c80ecc4f8eaaa01d8e7a36bcb3b4.tar.xz
freeipa-b4ca5c57d230c80ecc4f8eaaa01d8e7a36bcb3b4.zip
Server Upgrade: remove unused code in upgrade
https://fedorahosted.org/freeipa/ticket/4904 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/ldapupdate.py')
-rw-r--r--ipaserver/install/ldapupdate.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 077de3bd6..d3e3c3c32 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -185,16 +185,11 @@ class LDAPUpdate:
fqdn = installutils.get_fqdn()
if fqdn is None:
raise RuntimeError("Unable to determine hostname")
- fqhn = fqdn # Save this for the sub_dict variable
- if self.ldapi:
- fqdn = "ldapi://%%2fvar%%2frun%%2fslapd-%s.socket" % "-".join(
- self.realm.split(".")
- )
if not self.sub_dict.get("REALM") and self.realm is not None:
self.sub_dict["REALM"] = self.realm
if not self.sub_dict.get("FQDN"):
- self.sub_dict["FQDN"] = fqhn
+ self.sub_dict["FQDN"] = fqdn
if not self.sub_dict.get("DOMAIN"):
self.sub_dict["DOMAIN"] = domain
if not self.sub_dict.get("SUFFIX") and suffix is not None:
@@ -279,7 +274,6 @@ class LDAPUpdate:
for each DN in the file."""
update = {}
logical_line = ""
- action = ""
dn = None
lcount = 0