View | Details | Raw Unified | Return to bug 47091
Collapse All | Expand All

(-)a/services/univention-ad-connector/umc/python/adconnector/__init__.py (-4 / +4 lines)
Lines 399-411 class Instance(Base, ProgressMixin): Link Here
399
			raise UMC_Error(_('The AD member mode can only be configured on a DC master server.'))
399
			raise UMC_Error(_('The AD member mode can only be configured on a DC master server.'))
400
		except admember.failedADConnect as exc:  # lookup_adds_dc()
400
		except admember.failedADConnect as exc:  # lookup_adds_dc()
401
			MODULE.warn('Failure: %s' % exc)
401
			MODULE.warn('Failure: %s' % exc)
402
			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,)))
402
			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,)))
403
		except admember.domainnameMismatch as exc:  # check_domain()
403
		except admember.domainnameMismatch as exc:  # check_domain()
404
			MODULE.warn('Failure: %s' % exc)
404
			MODULE.warn('Failure: %s' % exc)
405
			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']})
405
			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']})
406
		except admember.connectionFailed as exc:  # check_connection()
406
		except admember.connectionFailed as exc:  # check_connection()
407
			MODULE.warn('Failure: %s' % exc)
407
			MODULE.warn('Failure: %s' % exc)
408
			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'))
408
			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))
409
		except admember.notDomainAdminInAD as exc:  # check_ad_account()
409
		except admember.notDomainAdminInAD as exc:  # check_ad_account()
410
			MODULE.warn('Failure: %s' % exc)
410
			MODULE.warn('Failure: %s' % exc)
411
			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.'))
411
			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.'))
Lines 528-538 class Instance(Base, ProgressMixin): Link Here
528
		except admember.invalidUCSServerRole as exc:
528
		except admember.invalidUCSServerRole as exc:
529
			_err(exc, _('The AD member mode can only be configured on a DC master server.'))
529
			_err(exc, _('The AD member mode can only be configured on a DC master server.'))
530
		except admember.failedADConnect as exc:
530
		except admember.failedADConnect as exc:
531
			_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,)))
531
			_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,)))
532
		except admember.domainnameMismatch as exc:
532
		except admember.domainnameMismatch as exc:
533
			_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']})
533
			_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']})
534
		except admember.connectionFailed as exc:
534
		except admember.connectionFailed as exc:
535
			_err(exc, _('Could not connect to AD Server %s. Please verify that username and password are correct.') % ad_domain_info.get('DC DNS Name'))
535
			_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))
536
		except admember.failedToSetAdministratorPassword as exc:
536
		except admember.failedToSetAdministratorPassword as exc:
537
			_err(exc, _('Failed to set the password of the UCS Administrator to the Active Directory Administrator password.'))
537
			_err(exc, _('Failed to set the password of the UCS Administrator to the Active Directory Administrator password.'))
538
		except admember.timeSyncronizationFailed as exc:
538
		except admember.timeSyncronizationFailed as exc:
(-)a/services/univention-ad-connector/umc/python/adconnector/de.po (-2 / +2 lines)
Lines 108-117 msgstr "" Link Here
108
#, python-format
108
#, python-format
109
msgid ""
109
msgid ""
110
"Could not connect to AD Server %s. Please verify that username and password "
110
"Could not connect to AD Server %s. Please verify that username and password "
111
"are correct."
111
"are correct. (Details:\n%s)"
112
msgstr ""
112
msgstr ""
113
"Eine Verbindung zum AD-Server %s konnte nicht hergestellt werden. Bitte "
113
"Eine Verbindung zum AD-Server %s konnte nicht hergestellt werden. Bitte "
114
"überprüfen Sie Benutzername und Password."
114
"überprüfen Sie Benutzername und Password. (Details:\n%s)"
115
115
116
#: umc/python/adconnector/__init__.py:384
116
#: umc/python/adconnector/__init__.py:384
117
#: umc/python/adconnector/__init__.py:503
117
#: umc/python/adconnector/__init__.py:503

Return to bug 47091