fix bug in check_volume_access (fixes vzrestore)

This commit is contained in:
Dietmar Maurer 2012-02-13 09:58:37 +01:00
parent 4384e19e9b
commit 3eac4e3570
3 changed files with 10 additions and 2 deletions

View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=1.0 VERSION=1.0
PACKAGE=libpve-access-control PACKAGE=libpve-access-control
PKGREL=8 PKGREL=9
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

View File

@ -14,6 +14,7 @@ use PVE::INotify;
use PVE::Cluster; use PVE::Cluster;
use PVE::ProcFSTools; use PVE::ProcFSTools;
use PVE::AccessControl; use PVE::AccessControl;
use Cwd 'abs_path';
use CGI; use CGI;
# we use this singleton class to pass RPC related environment values # we use this singleton class to pass RPC related environment values
@ -288,7 +289,8 @@ sub check_volume_access {
# test if we have read access to volid # test if we have read access to volid
my $path; my $path;
if (my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1)) { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
if ($sid) {
my ($ownervm, $vtype); my ($ownervm, $vtype);
($path, $ownervm, $vtype) = PVE::Storage::path($storecfg, $volid); ($path, $ownervm, $vtype) = PVE::Storage::path($storecfg, $volid);
if ($vtype eq 'iso' || $vtype eq 'vztmpl') { if ($vtype eq 'iso' || $vtype eq 'vztmpl') {

View File

@ -1,3 +1,9 @@
libpve-access-control (1.0-9) unstable; urgency=low
* fix bug in check_volume_access (fixes vzrestore)
-- Proxmox Support Team <support@proxmox.com> Mon, 13 Feb 2012 09:56:37 +0100
libpve-access-control (1.0-8) unstable; urgency=low libpve-access-control (1.0-8) unstable; urgency=low
* fix return value for empty ACL list. * fix return value for empty ACL list.