diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-10-14 14:05:07 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-10-13 21:24:34 -0400 |
commit | 3506dc8ed4e59f08c1094266482420744630f757 (patch) | |
tree | fad68c1a6d5ecb26f218d938f130b68c951b13d9 | |
parent | 1104a8898ca6d4e46f3671245703fe1ca8b40ec5 (diff) | |
download | freeipa.git-3506dc8ed4e59f08c1094266482420744630f757.tar.gz freeipa.git-3506dc8ed4e59f08c1094266482420744630f757.tar.xz freeipa.git-3506dc8ed4e59f08c1094266482420744630f757.zip |
If our domain is already configured in sssd.conf start with a new config.
https://fedorahosted.org/freeipa/ticket/1989
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 86e19e45..628652ef 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -680,10 +680,21 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options): print "The old /etc/sssd/sssd.conf is backed up and will be restored during uninstall." logging.error("Unable to parse existing SSSD config and --preserve-sssd was not specified: %s" % (str(e))) logging.info("New SSSD config will be created") + del sssdconfig sssdconfig = SSSDConfig.SSSDConfig() sssdconfig.new_config() - domain = sssdconfig.new_domain(cli_domain) + try: + domain = sssdconfig.new_domain(cli_domain) + except SSSDConfig.DomainAlreadyExistsError: + print "Domain %s is already configured in existing SSSD config, creating a new one." % cli_domain + print "The old /etc/sssd/sssd.conf is backed up and will be restored during uninstall." + logging.debug("Domain %s is already configured in existing SSSD config, creating a new one." % cli_domain) + del sssdconfig + sssdconfig = SSSDConfig.SSSDConfig() + sssdconfig.new_config() + domain = sssdconfig.new_domain(cli_domain) + domain.add_provider('ipa', 'id') if not options.on_master: |