From e6db55c0dbc722b5eec68bfb42f7a61f2c59ca37 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 2 Apr 2012 14:12:44 +0200 Subject: [PATCH] fix bug #135: use DNS compatible naming for 'pve-node' --- Makefile | 2 +- data/PVE/JSONSchema.pm | 3 +-- debian/changelog | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4fedd21..ddfe3ae 100644 --- 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 ac154cc..6b87302 100644 --- 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 752f6b5..153e300 100644 --- 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 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 -- 2.39.2