From 4e30a48d3cde4cab57a711503764bb9dddf2d53b Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 25 Sep 2020 11:14:04 +0200 Subject: [PATCH] trust-add: Catch correct exception when chown SSSD Commit 72fb4e6 introduced a regression. SSSD_USER.chown() raises ValueError instead of KeyError when SSSD user does not exist. Fixes: https://pagure.io/freeipa/issue/8516 Signed-off-by: Christian Heimes Reviewed-By: Florence Blanc-Renaud --- install/oddjob/com.redhat.idm.trust-fetch-domains.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains.in b/install/oddjob/com.redhat.idm.trust-fetch-domains.in index 0ef72481c..92fb4ce9b 100644 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains.in +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains.in @@ -97,7 +97,7 @@ def retrieve_keytab(api, ccache_name, oneway_keytab_name, oneway_principal): # Make sure SSSD is able to read the keytab try: constants.SSSD_USER.chown(oneway_keytab_name) - except KeyError: + except ValueError: # If user 'sssd' does not exist, we don't need to chown from root to sssd # because it means SSSD does not run as sssd user pass