Attachment 9541 Details for Bug 47091 – output_exception_for_feedback.patch

[patch] output_exception_for_feedback.patch

output_exception_for_feedback.patch (text/plain), 4.26 KB, created by Arvid Requate on 2018-05-28 12:06:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-05-28 12:06:32 CEST

Size: 4.26 KB

patch

obsolete

>diff --git a/services/univention-ad-connector/umc/python/adconnector/__init__.py b/services/univention-ad-connector/umc/python/adconnector/__init__.py
>index 26bef0ed0a..b4fb148cc5 100644
>--- a/services/univention-ad-connector/umc/python/adconnector/__init__.py
>+++ b/services/univention-ad-connector/umc/python/adconnector/__init__.py
>@@ -399,13 +399,13 @@ class Instance(Base, ProgressMixin):
> 			raise UMC_Error(_('The AD member mode can only be configured on a DC master server.'))
> 		except admember.failedADConnect as exc:  # lookup_adds_dc()
> 			MODULE.warn('Failure: %s' % exc)
>-			raise UMC_Error(_('Could not connect to AD Server %s. Please verify that the specified address is correct. (%s)') % (ad_server_address, "check_domain: %s" % (exc,)))
>+			raise UMC_Error(_('Could not connect to AD Server %s. Please verify that the specified address is correct. (%s)') % (ad_server_address, 'check_domain: %s' % (exc,)))
> 		except admember.domainnameMismatch as exc:  # check_domain()
> 			MODULE.warn('Failure: %s' % exc)
> 			raise UMC_Error(_('The domain name of the AD Server (%(ad_domain)s) does not match the local UCS domain name (%(ucs_domain)s). For the AD member mode, it is necessary to setup a UCS system with the same domain name as the AD Server.') % {'ad_domain': ad_domain_info.get("Domain"), 'ucs_domain': ucr['domainname']})
> 		except admember.connectionFailed as exc:  # check_connection()
> 			MODULE.warn('Failure: %s' % exc)
>-			raise UMC_Error(_('Could not connect to AD Server %s. Please verify that username and password are correct.') % ad_domain_info.get('DC DNS Name'))
>+			raise UMC_Error(_('Could not connect to AD Server %s. Please verify that username and password are correct. (Details:\n%s)' % (ad_domain_info.get('DC DNS Name'), exc))
> 		except admember.notDomainAdminInAD as exc:  # check_ad_account()
> 			MODULE.warn('Failure: %s' % exc)
> 			raise UMC_Error(_('The given user is not member of the Domain Admins group in Active Directory. This is a requirement for the Active Directory domain join.'))
>@@ -528,11 +528,11 @@ class Instance(Base, ProgressMixin):
> 		except admember.invalidUCSServerRole as exc:
> 			_err(exc, _('The AD member mode can only be configured on a DC master server.'))
> 		except admember.failedADConnect as exc:
>-			_err(exc, _('Could not connect to AD Server %s. Please verify that the specified address is correct. (%s)') % (ad_domain_info.get('DC DNS Name'), "admember_join: %s" % (exc,)))
>+			_err(exc, _('Could not connect to AD Server %s. Please verify that the specified address is correct. (%s)') % (ad_domain_info.get('DC DNS Name'), 'admember_join: %s' % (exc,)))
> 		except admember.domainnameMismatch as exc:
> 			_err(exc, _('The domain name of the AD Server (%(ad_domain)s) does not match the local UCS domain name (%(ucs_domain)s). For the AD member mode, it is necessary to setup a UCS system with the same domain name as the AD Server.') % {'ad_domain': ad_domain_info["Domain"], 'ucs_domain': ucr['domainname']})
> 		except admember.connectionFailed as exc:
>-			_err(exc, _('Could not connect to AD Server %s. Please verify that username and password are correct.') % ad_domain_info.get('DC DNS Name'))
>+			_err(exc, _('Could not connect to AD Server %s. Please verify that username and password are correct. (Details:\n%s)') % (ad_domain_info.get('DC DNS Name'), exc))
> 		except admember.failedToSetAdministratorPassword as exc:
> 			_err(exc, _('Failed to set the password of the UCS Administrator to the Active Directory Administrator password.'))
> 		except admember.timeSyncronizationFailed as exc:
>diff --git a/services/univention-ad-connector/umc/python/adconnector/de.po b/services/univention-ad-connector/umc/python/adconnector/de.po
>index 913b5959bc..3c02a7c059 100644
>--- a/services/univention-ad-connector/umc/python/adconnector/de.po
>+++ b/services/univention-ad-connector/umc/python/adconnector/de.po
>@@ -108,10 +108,10 @@ msgstr ""
> #, python-format
> msgid ""
> "Could not connect to AD Server %s. Please verify that username and password "
>-"are correct."
>+"are correct. (Details:\n%s)"
> msgstr ""
> "Eine Verbindung zum AD-Server %s konnte nicht hergestellt werden. Bitte "
>-"Ã¼berprÃ¼fen Sie Benutzername und Password."
>+"Ã¼berprÃ¼fen Sie Benutzername und Password. (Details:\n%s)"
> 
> #: umc/python/adconnector/__init__.py:384
> #: umc/python/adconnector/__init__.py:503

Actions: View | Diff

Attachments on bug 47091: 9541