fix bug #135: allow single letter 'dns-name', allow to start name with numbers

diff --git a/Makefile b/Makefile
index 19b28b5525f1d964da261e3f8c41e17298ee5ed7..4fedd2130d1915ea9c95129d3750724b827d86c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 VERSION=1.0
-PKGREL=23
+PKGREL=24
 
 PACKAGE=libpve-common-perl
 

diff --git a/data/PVE/JSONSchema.pm b/data/PVE/JSONSchema.pm
index 816083a2be1fe7e2d32dae8831a742fd62cad5d9..ac154cc39b9cbbdea8864e01944b804915eae005 100644 (file)
--- a/data/PVE/JSONSchema.pm
+++ b/data/PVE/JSONSchema.pm
@@ -178,7 +178,7 @@ 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])";
+    my $namere = "([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)";
 
     if ($name !~ /^(${namere}\.)*${namere}$/) {
           return undef if $noerr;

diff --git a/debian/changelog b/debian/changelog
index 84d1f40c07fbcd9c59195024f7dd6f7cb16c64b1..752f6b528827033605c399752189b4a301c19a95 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libpve-common-perl (1.0-24) unstable; urgency=low
+
+  * fix bug #135: allow single letter 'dns-name', allow to start names
+    with numbers
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Apr 2012 12:04:02 +0200
+
 libpve-common-perl (1.0-23) unstable; urgency=low
 
   * moved dir_glob_regex() and dir_glob_foreach() from PVE::Storage