summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-02-08 18:37:43 +0100
committerMartin Kosek <mkosek@redhat.com>2013-02-18 16:50:28 +0100
commitd73dd4b6839867390fdf439d71a7f77bdc352acc (patch)
tree82d134d4ac6b5bb58c8b86cb7d0911ac291fdc7e
parent559a87017a2776f4a615b1bdab43728c6851de99 (diff)
downloadfreeipa.git-d73dd4b6839867390fdf439d71a7f77bdc352acc.tar.gz
freeipa.git-d73dd4b6839867390fdf439d71a7f77bdc352acc.tar.xz
freeipa.git-d73dd4b6839867390fdf439d71a7f77bdc352acc.zip
Allow ipa-replica-conncheck and ipa-adtrust-install to read krb5 includedir
https://fedorahosted.org/freeipa/ticket/3132
-rwxr-xr-xinstall/tools/ipa-replica-conncheck2
-rw-r--r--ipaserver/install/adtrustinstance.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
index 29c43f60..8c96136d 100755
--- a/install/tools/ipa-replica-conncheck
+++ b/install/tools/ipa-replica-conncheck
@@ -165,7 +165,7 @@ def sigterm_handler(signum, frame):
def configure_krb5_conf(realm, kdc, filename):
krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
- krbconf.setOptionAssignment(" = ")
+ krbconf.setOptionAssignment((" = ", " "))
krbconf.setSectionNameDelimiters(("[","]"))
krbconf.setSubSectionDelimiters(("{","}"))
krbconf.setIndent((""," "," "))
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 16f2136a..cba88eb0 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -574,7 +574,7 @@ class ADTRUSTInstance(service.Service):
self.print_msg("Cannot modify /etc/krb5.conf")
krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
- krbconf.setOptionAssignment(" = ")
+ krbconf.setOptionAssignment((" = ", " "))
krbconf.setSectionNameDelimiters(("[", "]"))
krbconf.setSubSectionDelimiters(("{", "}"))
krbconf.setIndent(("", " ", " "))