summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-07-28 09:47:39 +0200
committerMartin Basti <mbasti@redhat.com>2016-08-01 17:18:29 +0200
commit2d4d1a9dc0ef2bbe86751768d6e6b009a52c0dc9 (patch)
tree78b20e5ba844a83ede41942aa33a9ac157804695 /client
parent63a91ca49a40590784dbc3e91001f9864f3a185e (diff)
downloadfreeipa-2d4d1a9dc0ef2bbe86751768d6e6b009a52c0dc9.tar.gz
freeipa-2d4d1a9dc0ef2bbe86751768d6e6b009a52c0dc9.tar.xz
freeipa-2d4d1a9dc0ef2bbe86751768d6e6b009a52c0dc9.zip
Do not initialize API in ipa-client-automount uninstall
API is not needed in uninstallation, it may only produce errors. https://fedorahosted.org/freeipa/ticket/6072 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Diffstat (limited to 'client')
-rwxr-xr-xclient/ipa-client-automount6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/ipa-client-automount b/client/ipa-client-automount
index f06aa7f8d..08209c849 100755
--- a/client/ipa-client-automount
+++ b/client/ipa-client-automount
@@ -378,6 +378,9 @@ def main():
paths.IPACLIENT_INSTALL_LOG, verbose=False, debug=options.debug,
filemode='a', console_format='%(message)s')
+ if options.uninstall:
+ return uninstall(fstore, statestore)
+
cfg = dict(
context='cli_installer',
in_server=False,
@@ -392,9 +395,6 @@ def main():
if os.path.exists(paths.IPA_CA_CRT):
ca_cert_path = paths.IPA_CA_CRT
- if options.uninstall:
- return uninstall(fstore, statestore)
-
if statestore.has_state('autofs'):
sys.exit('automount is already configured on this system.\n')