From c467f04b77a602083da7903499a301163d82d46b Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Oct 25 2016 19:05:40 +0000 Subject: [PATCH 1/2] Do not error out if infosssd gets unconfigure without being configured Signed-off-by: Patrick Uiterwijk Reviewed-by: Dan Theisen Reviewed-by: Randy Barlow --- diff --git a/ipsilon/info/infosssd.py b/ipsilon/info/infosssd.py index ca02e1f..1ed7d4b 100644 --- a/ipsilon/info/infosssd.py +++ b/ipsilon/info/infosssd.py @@ -247,6 +247,11 @@ class Installer(InfoProviderInstaller): po.save_enabled_state() def unconfigure(self, opts, changes): + if 'domains' not in changes: + # We always record domains on configure, if we don't have that, we + # were not configured. + return + try: sssdconfig = SSSDConfig.SSSDConfig() sssdconfig.import_config() From f1c327035ed3a94dc1df47d662ead456ab264b73 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Oct 25 2016 19:05:46 +0000 Subject: [PATCH 2/2] Enable infosssd with the IPA helper Signed-off-by: Patrick Uiterwijk Reviewed-by: Dan Theisen Reviewed-by: Randy Barlow --- diff --git a/ipsilon/helpers/ipa.py b/ipsilon/helpers/ipa.py index 2005f88..5fc0c82 100644 --- a/ipsilon/helpers/ipa.py +++ b/ipsilon/helpers/ipa.py @@ -184,5 +184,6 @@ class Installer(EnvHelpersInstaller): if 'gssapi' not in opts['lm_order']: opts['lm_order'].insert(0, 'gssapi') opts['form'] = 'yes' + opts['info_sssd'] = 'yes' if not any(lm in opts['lm_order'] for lm in ('form', 'pam')): opts['lm_order'].append('form')