use DNS compatible regex in upid parser

diff --git a/Makefile b/Makefile
index 794cb39f36c60db34c82c28fd6259d72180acba0..5579b3c4c70617be98e4058985bd29a7a36fc547 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 VERSION=1.0
 RELEASE=2.0
 
 VERSION=1.0

-PKGREL=26
+PKGREL=27

 
 PACKAGE=libpve-common-perl
 
 
 PACKAGE=libpve-common-perl
 

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 543829596c94f255af68d6d4631de9110c986f87..403249b57577c643955e036695b88b6b8365a2d5 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -652,16 +652,16 @@ sub upid_decode {
     my $filename;
 
     # "UPID:$node:$pid:$pstart:$startime:$dtype:$id:$user"
     my $filename;
 
     # "UPID:$node:$pid:$pstart:$startime:$dtype:$id:$user"

-    if ($upid =~ m/^UPID:([A-Za-z][[:alnum:]\-]*[[:alnum:]]+):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {
+    if ($upid =~ m/^UPID:([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {

        $res->{node} = $1;
        $res->{node} = $1;

-       $res->{pid} = hex($2);
-       $res->{pstart} = hex($3);
-       $res->{starttime} = hex($4);
-       $res->{type} = $5;
-       $res->{id} = $6;
-       $res->{user} = $7;
-
-       my $subdir = substr($4, 7, 8);
+       $res->{pid} = hex($3);
+       $res->{pstart} = hex($4);
+       $res->{starttime} = hex($5);
+       $res->{type} = $6;
+       $res->{id} = $7;
+       $res->{user} = $8;
+
+       my $subdir = substr($5, 7, 8);

        $filename = "$pvetaskdir/$subdir/$upid";
 
     } else {
        $filename = "$pvetaskdir/$subdir/$upid";
 
     } else {

diff --git a/debian/changelog b/debian/changelog
index 44796a1409fbb7748fdb603a96e2ec976befa7c5..504f26a146f8e9a30e1726df8d57d6ef19af394b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpve-common-perl (1.0-27) unstable; urgency=low
+
+  * fix bug #172: use DNS compatible regex in upid parser
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Apr 2012 08:31:44 +0200
+

 libpve-common-perl (1.0-26) unstable; urgency=low
 
   * add Turkish keyboard mappings
 libpve-common-perl (1.0-26) unstable; urgency=low
 
   * add Turkish keyboard mappings