From cc348b990e607cb574d6eb70b6a9e35f14e8700c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Tue, 25 Jun 2019 16:24:00 +0200 Subject: [PATCH] ipa-client-automount: fix '--idmap-domain DNS' logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously '--idmap-domain DNS' would assume the Domain parameter of idmapd.conf was already absent. With this fix, the Domain parameter is always removed and the configuration file is always backuped. Related-to: https://pagure.io/freeipa/issue/7918 Fixes: https://pagure.io/freeipa/issue/7988 Signed-off-by: François Cami fcami@redhat.com Reviewed-By: Christian Heimes --- client/ipa-client-automount.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ipa-client-automount.in b/client/ipa-client-automount.in index beece5c2d..d8bec1c1d 100644 --- a/client/ipa-client-automount.in +++ b/client/ipa-client-automount.in @@ -371,7 +371,7 @@ def configure_nfs(fstore, statestore, options): changes = [conf.setOption('Domain', api.env.domain)] elif options.idmapdomain == 'DNS': # Rely on idmapd auto-detection (DNS) - changes = None + changes = [conf.rmOption('Domain')] else: # Set NFSv4 domain to what was provided changes = [conf.setOption('Domain', options.idmapdomain)]