summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/installutils.py
diff options
context:
space:
mode:
authorAna Krivokapic <akrivoka@redhat.com>2013-09-03 12:42:48 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-09-16 12:35:36 +0200
commit15cc9740c0ae7d4715df97a1b9ec0166d47c30c2 (patch)
treeb63da59b945fc86c70bcf41aea58bbd036b2eb71 /ipaserver/install/installutils.py
parent5157fd450fb33a7a3b68525a255d2976dbb0840a (diff)
downloadfreeipa.git-15cc9740c0ae7d4715df97a1b9ec0166d47c30c2.tar.gz
freeipa.git-15cc9740c0ae7d4715df97a1b9ec0166d47c30c2.tar.xz
freeipa.git-15cc9740c0ae7d4715df97a1b9ec0166d47c30c2.zip
Do not show unexpected error in ipa-ldap-updater
Prevent showing of unfriendly "Unexpected error" message, when providing incorrect DM password to ipa-ldap-updater. https://fedorahosted.org/freeipa/ticket/3825
Diffstat (limited to 'ipaserver/install/installutils.py')
-rw-r--r--ipaserver/install/installutils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 268279dc..67c3fa9b 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -673,6 +673,8 @@ def handle_error(error, log_file_name=None):
if isinstance(error, socket.error):
return error, 1
+ if isinstance(error, errors.ACIError):
+ return error.message, 1
if isinstance(error, ldap.INVALID_CREDENTIALS):
return "Invalid password", 1
if isinstance(error, ldap.INSUFFICIENT_ACCESS):