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

(-)a/base/univention-system-setup/umc/python/setup/util.py (-11 / +4 lines)
 Lines 870-891   def is_domainname(domainname): Link Here 
870
is_domainname.RE = re.compile(r'^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$', re.I)
870
is_domainname.RE = re.compile(r'^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$', re.I)
871
871
872
872
873
def is_windowsdomainname(domainname):
873
def is_windowsdomainname(name):
874
	return is_windowsdomainname.RE.match(domainname) is not None and len(domainname) < 14
874
	validname = re.sub('[\\\\/:*?><|.]', '', name)
875
875
	return name == validname and len(name) < 14
876
877
is_windowsdomainname.RE = re.compile(r"^[A-Z](?:[A-Z0-9-]*[A-Z0-9])?$")
878
876
879
877
880
def domain2windowdomain(domainname):
878
def domain2windowdomain(domainname):
881
	windomain = domainname.split('.', 1)[0].upper()
879
	windomain = domainname.split('.', 1)[0].upper()
882
880
883
	invalidChars = re.compile(r"^[^A-Z]*([A-Z0-9-]*?)[^A-Z0-9]*$")
881
	windomain = re.sub('[\\\\/:*?><|.]', '', windomain)
884
	match = invalidChars.match(windomain)
885
	if match:
886
		windomain = match.group(1)
887
	else:
888
		windomain = ''
889
882
890
	windomain = windomain[:15]  # enforce netbios limit
883
	windomain = windomain[:15]  # enforce netbios limit
891
884

Return to bug 49326