remove 'name' to the list of utf8 encoded parameters.

Revert previous change. Add dns-name format instead.

diff --git a/data/PVE/JSONSchema.pm b/data/PVE/JSONSchema.pm
index ef89fb58d55963deef9219827bda6da131acd10f..816083a2be1fe7e2d32dae8831a742fd62cad5d9 100644 (file)
--- 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 d1dfa5d105afc36c35a9bc8f170bae347ef6a6e4..66bc644d3bde91262d44e849e714d47100985653 100644 (file)
--- 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 97ace883dad934a2a687df34b256390a65f3069c..e373585517bd819629518b7ce9b728060c602148 100644 (file)
--- 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 <support@proxmox.com>  Mon, 12 Mar 2012 12:31:27 +0100