fix bug #135: use DNS compatible naming for 'pve-node'

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

diff --git a/data/PVE/JSONSchema.pm b/data/PVE/JSONSchema.pm
index ac154cc39b9cbbdea8864e01944b804915eae005..6b87302c6132951f78cfe571850530405e8fdca4 100644 (file)
--- a/data/PVE/JSONSchema.pm
+++ b/data/PVE/JSONSchema.pm
@@ -129,8 +129,7 @@ register_format('pve-node', \&pve_verify_node_name);
 sub pve_verify_node_name {
     my ($node, $noerr) = @_;
 
-    # todo: use better regex ?
-    if ($node !~ m/^[A-Za-z][[:alnum:]\-]*[[:alnum:]]+$/) {
+    if ($node !~ m/^([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)$/) {
        return undef if $noerr;
        die "value does not look like a valid node name\n";
     }

diff --git a/debian/changelog b/debian/changelog
index 752f6b528827033605c399752189b4a301c19a95..153e30035fae1ce8c6545d761ead9626d1f42721 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpve-common-perl (1.0-25) unstable; urgency=low
+
+  * fix bug #135: use DNS compatible naming for 'pve-node'
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Apr 2012 14:10:45 +0200
+
 libpve-common-perl (1.0-24) unstable; urgency=low
 
   * fix bug #135: allow single letter 'dns-name', allow to start names