summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2012-09-11 04:43:57 -0400
committerMartin Kosek <mkosek@redhat.com>2012-09-13 13:13:16 +0200
commit8728d3145f4c2f7bd1fed8c75f33f9ed7df555d2 (patch)
treeeddcda5e9092613729d78aac7b44c3c5751ec2b3 /ipa-client
parent2225730e99cef53415dbdd850f469081f98e1a72 (diff)
downloadfreeipa-8728d3145f4c2f7bd1fed8c75f33f9ed7df555d2.tar.gz
freeipa-8728d3145f4c2f7bd1fed8c75f33f9ed7df555d2.tar.xz
freeipa-8728d3145f4c2f7bd1fed8c75f33f9ed7df555d2.zip
Add the SSH service to SSSD config file before trying to activate it.
ticket 3069
Diffstat (limited to 'ipa-client')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install8
1 files changed, 6 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 3b1fd1a44..52d3533d7 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -803,14 +803,18 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, clie
domain = sssdconfig.new_domain(cli_domain)
try:
- sssdconfig.activate_service('ssh')
- except SSSDConfig.NoServiceError:
+ sssdconfig.new_service('ssh')
+ except SSSDConfig.ServiceAlreadyExists:
+ pass
+ except SSSDConfig.ServiceNotRecognizedError:
root_logger.error("Unable to activate the SSH service in SSSD config.")
root_logger.info(
"Please make sure you have SSSD built with SSH support installed.")
root_logger.info(
"Configure SSH support manually in /etc/sssd/sssd.conf.")
+ sssdconfig.activate_service('ssh')
+
domain.add_provider('ipa', 'id')
#add discovery domain if client domain different from server domain