Attachment #5568 for bug #30816

Lines 171-177 define([ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/js/setup/InterfaceWizard.js (-2 / +4 lines)
171	name: 'name',	171	name: 'name',
172	type: TextBox,	172	type: TextBox,
173	validator: function(value) {	173	validator: function(value) {
174	return (/^[a-z]+[0-9]+(\.[0-9]+)?$/).test(value);	174	if (value.length > 15 \|\| value === '.' \|\| value === '..')
		175	return false;
		176	return /^(?![.]{1,2}$)[^/ \t\n\r\f]{1,15}(\.[0-9]+)?$/.test(value)
175	},	177	},
176	visible: false	178	visible: false
177	}, {	179	}, {
Lines 182-188 define([ Link Here
182	type: TextBox,	184	type: TextBox,
183	validator: lang.hitch(this, function(value) {	185	validator: lang.hitch(this, function(value) {
184	if (this.getInterfaceType() === 'Bond' \|\| this.getInterfaceType() === 'Bridge') {	186	if (this.getInterfaceType() === 'Bond' \|\| this.getInterfaceType() === 'Bridge') {
185	return (/^[a-zA-Z]+[0-9]+$/).test(value);	187	return /^(?![.]{1,2}$)[^/ \t\n\r\f]{1,15}$/.test(value)
186	}	188	}
187	return true;	189	return true;
188	}),	190	}),

Lines 48-54 _ = Translation('univention-management-console-module-setup').translate Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/python/setup/network.py (-1 / +1 lines)
48		48
49	RE_INTERFACE = re.compile(r'^interfaces/(?!(?:primary\|restart/auto\|handler)$)([^/]+?)(_[0-9]+)?/')	49	RE_INTERFACE = re.compile(r'^interfaces/(?!(?:primary\|restart/auto\|handler)$)([^/]+?)(_[0-9]+)?/')
50	RE_IPV6_ID = re.compile(r'^[a-zA-Z0-9]+\Z')	50	RE_IPV6_ID = re.compile(r'^[a-zA-Z0-9]+\Z')
51	#VALID_NAME_RE = re.compile(r'^(?![.]{1,2})[^/ \t\n\r\f]{1,15}\Z')	51	#VALID_NAME_RE = re.compile(r'^(?![.]{1,2}\Z)[^/ \t\n\r\f]{1,15}\Z')
52		52
53	PHYSICAL_INTERFACES = [dev['name'] for dev in detect_interfaces()]	53	PHYSICAL_INTERFACES = [dev['name'] for dev in detect_interfaces()]
54		54

Return to bug 30816