diff --git a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/__init__.py b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/__init__.py index 0efbd48..89be060 100644 --- a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/__init__.py +++ b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/__init__.py @@ -386,7 +386,7 @@ def _append(key, message): # host and domain name packages = set(values.get('components', [])) - _check('hostname', util.is_hostname, _('The hostname is not a valid fully qualified domain name in lowercase (e.g. host.example.com).')) + _check('hostname', util.is_hostname, _('The hostname is not a valid fully qualified domain name (e.g. host.example.com).')) _check('hostname', lambda x: len(x) <= 13, _('A valid NetBIOS name can not be longer than 13 characters. If Samba is installed, the hostname should be shortened.'), critical=('univention-samba' in packages or 'univention-samba4' in packages)) _check('domainname', util.is_domainname, _("Please enter a valid fully qualified domain name in lowercase (e.g. host.example.com).")) hostname = allValues.get('hostname', '') diff --git a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/de.po b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/de.po index efb4f8e..9964938 100644 --- a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/de.po +++ b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/de.po @@ -159,8 +159,8 @@ msgstr "Der folgende Wert ist zu lang, es sind nur 64 Zeichen erlaubt: %s" msgid "The given user is not member of the Domain Admins group in Active Directory. This is a requirement for the Active Directory domain join." msgstr "Der angegebene Benutzer ist kein Mitglied der Gruppe Domain Admins im Active Directory. Dies ist eine Voraussetzung für den Active Directory Domänenbeitritt." -msgid "The hostname is not a valid fully qualified domain name in lowercase (e.g. host.example.com)." -msgstr "Der Rechnernamen muss vollständig und klein geschrieben sein (z.B. host.example.com)." +msgid "The hostname is not a valid fully qualified domain name (e.g. host.example.com)." +msgstr "Der Rechnername ist kein gültiger FQDN (z.B. host.example.com)." msgid "The length of fully qualified domain name is greater than 63 characters." msgstr "Die Länge von System- und Domänennamen ist größer als 63 Zeichen." diff --git a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/util.py b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/util.py index da315fb..e4c3899 100644 --- a/ucs-4.0-1/base/univention-system-setup/umc/python/setup/util.py +++ b/ucs-4.0-1/base/univention-system-setup/umc/python/setup/util.py @@ -710,7 +710,7 @@ def is_ipv6netmask(addr_netmask): def is_hostname(hostname): return is_hostname.RE.match(hostname) is not None -is_hostname.RE = re.compile("^[a-z]([a-z0-9-]*[a-z0-9])*$") +is_hostname.RE = re.compile("^[a-z]([a-z0-9-]*[a-z0-9])*$", re.IGNORECASE) def is_domainname(domainname): """