summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2013-04-22 11:37:33 +0200
committerRob Crittenden <rcritten@redhat.com>2013-04-23 16:14:25 -0400
commit40966cbe635eb0df80aa8d58c888d325b984ea46 (patch)
treeda59588c5a32086b2c40d3cd9246ff6ed50bf48f /ipa-client/ipa-install
parent6e8d311dac90c52074cfcc07b45a97326e8b7e19 (diff)
downloadfreeipa-40966cbe635eb0df80aa8d58c888d325b984ea46.tar.gz
freeipa-40966cbe635eb0df80aa8d58c888d325b984ea46.tar.xz
freeipa-40966cbe635eb0df80aa8d58c888d325b984ea46.zip
Avoid removing sss from nssswitch.conf during client uninstall
This patch makes sure that sss is not removed from nsswitch.conf which causes probles with later uses of sssd. Makes sure that authconfig with --disablesssd option is not executed during ipa client uninstall. https://fedorahosted.org/freeipa/ticket/3577
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install12
1 files changed, 7 insertions, 5 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index b51565f04..a60124bb7 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -445,7 +445,10 @@ def uninstall(options, env):
# disable only those configurations that we enabled during install
for conf in ('ldap', 'krb5', 'sssd', 'sssdauth', 'mkhomedir'):
cnf = statestore.restore_state('authconfig', conf)
- if cnf:
+ # Do not disable sssd, as this can cause issues with its later
+ # uses. Remove it from statestore however, so that it becomes
+ # empty at the end of uninstall process.
+ if cnf and conf != 'sssd':
auth_config.disable(conf)
else:
# There was no authconfig status store
@@ -454,10 +457,9 @@ def uninstall(options, env):
auth_config.disable("ldap").\
disable("krb5")
if not(was_sssd_installed and was_sssd_configured):
- # assume there was sssd.conf before install and there were more than one domain in it
- # In such case restoring sssd.conf will require us to keep SSSD running
- auth_config.disable("sssd").\
- disable("sssdauth")
+ # Only disable sssdauth. Disabling sssd would cause issues
+ # with its later uses.
+ auth_config.disable("sssdauth")
auth_config.disable("mkhomedir")
auth_config.add_option("update")