summarylogtreecommitdiffstats
path: root/0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch')
-rw-r--r--0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch b/0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch
new file mode 100644
index 000000000000..3377bb665e39
--- /dev/null
+++ b/0003-client-install-do-not-assume-etc-krb5.conf.d-exists.patch
@@ -0,0 +1,29 @@
+From 124251f2d4bb915d69ef9e11e61494a27ef5b370 Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <jcholast@redhat.com>
+Date: Tue, 2 Aug 2016 13:49:36 +0200
+Subject: [PATCH 3/3] client install: do not assume /etc/krb5.conf.d exists
+
+---
+ client/ipa-client-install | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/client/ipa-client-install b/client/ipa-client-install
+index cee202f..12c6153 100755
+--- a/client/ipa-client-install
++++ b/client/ipa-client-install
+@@ -1066,8 +1066,10 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
+ krbconf.setIndent((""," "," "))
+
+ opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
+- {'name':'empty', 'type':'empty'},
+- {'name':'includedir', 'type':'option', 'value':paths.COMMON_KRB5_CONF_DIR, 'delim':' '}]
++ {'name':'empty', 'type':'empty'}]
++
++ if os.path.exists(paths.COMMON_KRB5_CONF_DIR):
++ opts.append({'name':'includedir', 'type':'option', 'value':paths.COMMON_KRB5_CONF_DIR, 'delim':' '})
+
+ # SSSD include dir
+ if options.sssd:
+--
+2.7.4
+