From 34ebb22690b05bd812b660ad91d790317f231981 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Mar 2012 06:56:31 +0100 Subject: [PATCH] remove 'name' to the list of utf8 encoded parameters. Revert previous change. Add dns-name format instead. --- data/PVE/JSONSchema.pm | 13 +++++++++++++ data/PVE/Tools.pm | 2 +- debian/changelog | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/PVE/JSONSchema.pm b/data/PVE/JSONSchema.pm index ef89fb5..816083a 100644 --- a/data/PVE/JSONSchema.pm +++ b/data/PVE/JSONSchema.pm @@ -174,6 +174,19 @@ sub pve_verify_email { return $email; } +register_format('dns-name', \&pve_verify_dns_name); +sub pve_verify_dns_name { + my ($name, $noerr) = @_; + + my $namere = "([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])"; + + if ($name !~ /^(${namere}\.)*${namere}$/) { + return undef if $noerr; + die "value does not look like a valid DNS name\n"; + } + return $name; +} + # network interface name register_format('pve-iface', \&pve_verify_iface); sub pve_verify_iface { diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm index d1dfa5d..66bc644 100644 --- a/data/PVE/Tools.pm +++ b/data/PVE/Tools.pm @@ -733,7 +733,7 @@ sub decode_text { sub decode_utf8_parameters { my ($param) = @_; - foreach my $p (qw(name comment description firstname lastname)) { + foreach my $p (qw(comment description firstname lastname)) { $param->{$p} = decode('utf8', $param->{$p}) if $param->{$p}; } diff --git a/debian/changelog b/debian/changelog index 97ace88..e373585 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ libpve-common-perl (1.0-19) unstable; urgency=low - * add 'name' to the list of utf8 encoded parameters + * add dns-name format -- Proxmox Support Team Mon, 12 Mar 2012 12:31:27 +0100 -- 2.39.2