--- rpms/e-smith-hosts/sme9/e-smith-hosts-2.4.0.comment_hostname_validator.patch 2015/01/22 07:35:32 1.3 +++ rpms/e-smith-hosts/sme9/e-smith-hosts-2.4.0.comment_hostname_validator.patch 2015/01/26 18:02:25 1.4 @@ -15,15 +15,6 @@ diff -Nur e-smith-hosts-2.4.0.old8723/ro diff -Nur e-smith-hosts-2.4.0.old8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries --- e-smith-hosts-2.4.0.old8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries 2015-01-18 11:25:40.356221775 +0100 +++ e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries 2015-01-18 12:57:12.694843190 +0100 -@@ -128,7 +128,7 @@ - - HOSTNAME_DESCRIPTION - -- The hostname must contain only letters, numbers, and hyphens, -+ The hostname and the comment must contain only letters, numbers, and hyphens, - and must start with a letter or number. - - @@ -271,4 +271,18 @@ MUST_BE_VALID_HOSTNAME_OR_IP Must be a valid hostname or IP number @@ -32,7 +23,7 @@ diff -Nur e-smith-hosts-2.4.0.old8723/ro + HOSTNAME_COMMENT_ERROR + + Error: unexpected characters in the comment of "{$hostname}.{$domain}". -+ The comment must contain only letters, numbers and hyphens, and must start with a letter or number. ++ The comment must contain only letters, numbers, undescores, dots and hyphens, and must start with a letter or number. + + + @@ -59,7 +50,7 @@ diff -Nur e-smith-hosts-2.4.0.old8723/ro + return $self->error('HOSTNAME_VALIDATOR_ERROR'); + } + -+ unless ( $comment =~ /^[a-z0-9][a-z0-9-]*$/ ) ++ unless ( $comment =~ /^([a-z0-9][\_\.\-a-z0-9\s]*)$/ ) + { + return $self->error('HOSTNAME_COMMENT_ERROR'); }