Re: [Freeipa-devel] [PATCH] Allow ipa-replica-conncheck and ipa-adtrust-install to read krb5 includedir
On 02/10/2013 10:22 PM, Alexander Bokovoy wrote: > On Fri, 08 Feb 2013, Jakub Hrozek wrote: >> The krb5 includedir uses a different delimeter (space) than the rest of the >> krb5 >> config file (equal sign). But only the ipa-client-install and >> ipa-server-install scripts were set with the correct delimeters. This >> patch also adds the delimeters to ipa-adtrust-install and >> ipa-replica-conncheck. > ACK. Works for me on Fedora 18 with git master. > > I've also checked RHEL 6.4 beta but since both original fix and this one > are missing there, no changes were required to have ipa-adtrust-install > working with 'includedir' defined in /etc/krb5.conf. > Pushed to master, ipa-3-1. Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Allow ipa-replica-conncheck and ipa-adtrust-install to read krb5 includedir
On 02/10/2013 10:22 PM, Alexander Bokovoy wrote: On Fri, 08 Feb 2013, Jakub Hrozek wrote: The krb5 includedir uses a different delimeter (space) than the rest of the krb5 config file (equal sign). But only the ipa-client-install and ipa-server-install scripts were set with the correct delimeters. This patch also adds the delimeters to ipa-adtrust-install and ipa-replica-conncheck. ACK. Works for me on Fedora 18 with git master. I've also checked RHEL 6.4 beta but since both original fix and this one are missing there, no changes were required to have ipa-adtrust-install working with 'includedir' defined in /etc/krb5.conf. This has been ACKed for a week, could someone with commit rights push it? -- Petr³ ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Allow ipa-replica-conncheck and ipa-adtrust-install to read krb5 includedir
On Fri, 08 Feb 2013, Jakub Hrozek wrote: The krb5 includedir uses a different delimeter (space) than the rest of the krb5 config file (equal sign). But only the ipa-client-install and ipa-server-install scripts were set with the correct delimeters. This patch also adds the delimeters to ipa-adtrust-install and ipa-replica-conncheck. ACK. Works for me on Fedora 18 with git master. I've also checked RHEL 6.4 beta but since both original fix and this one are missing there, no changes were required to have ipa-adtrust-install working with 'includedir' defined in /etc/krb5.conf. -- / Alexander Bokovoy ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
[Freeipa-devel] [PATCH] Allow ipa-replica-conncheck and ipa-adtrust-install to read krb5 includedir
The krb5 includedir uses a different delimeter (space) than the rest of the krb5
config file (equal sign). But only the ipa-client-install and
ipa-server-install scripts were set with the correct delimeters. This
patch also adds the delimeters to ipa-adtrust-install and
ipa-replica-conncheck.
>From 194748f492f5751ec24c527469b1a7bcfdac76fa Mon Sep 17 00:00:00 2001
From: Jakub Hrozek
Date: Fri, 8 Feb 2013 18:37:43 +0100
Subject: [PATCH] Allow ipa-replica-conncheck and ipa-adtrust-install to read
krb5 includedir
https://fedorahosted.org/freeipa/ticket/3132
---
install/tools/ipa-replica-conncheck | 2 +-
ipaserver/install/adtrustinstance.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/ipa-replica-conncheck
b/install/tools/ipa-replica-conncheck
index
29c43f60bd9e38d649db3730daacb76bd45b8786..8c96136d16fbf7ea33170eee1dedb9d500ceeecd
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
16f2136a6485e6915fd5de2000e6a378d03b44aa..cba88eb065cf2764ad4548742019a9f5cc40f499
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(("", " ", ""))
--
1.8.1
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
