summaryrefslogtreecommitdiff
path: root/src/access
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-09-11 14:23:24 +0100
committerDaniel P. Berrange <berrange@redhat.com>2013-09-12 11:15:52 +0100
commit621849383ad1aad61fe630184e689f5aca6ab7e0 (patch)
tree0c19d28fc65ce7086a1ab323fdad741c45c6bab9 /src/access
parentf084caae7c5db8ae03e7fafce164c73f65681843 (diff)
downloadlibvirt-621849383ad1aad61fe630184e689f5aca6ab7e0.tar.gz
Fix polkit permission names for storage pools, vols & node devices
The polkit access driver used the wrong permission names for checks on storage pools, volumes and node devices. This led to them always being denied access. The 'dettach' permission was also mis-spelt and should have been 'detach'. While permission names are ABI sensitive, the fact that the code used the wrong object name for checking node device permissions, means that no one could have used the mis-spelt 'dettach' permission. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'src/access')
-rw-r--r--src/access/viraccessdriverpolkit.c6
-rw-r--r--src/access/viraccessperm.c2
-rw-r--r--src/access/viraccessperm.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index 4c76e64ebb..b472bc3020 100644
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -248,7 +248,7 @@ virAccessDriverPolkitCheckNodeDevice(virAccessManagerPtr manager,
};
return virAccessDriverPolkitCheck(manager,
- "nodedevice",
+ "node-device",
virAccessPermNodeDeviceTypeToString(perm),
attrs);
}
@@ -355,7 +355,7 @@ virAccessDriverPolkitCheckStoragePool(virAccessManagerPtr manager,
virUUIDFormat(pool->uuid, uuidstr);
return virAccessDriverPolkitCheck(manager,
- "pool",
+ "storage-pool",
virAccessPermStoragePoolTypeToString(perm),
attrs);
}
@@ -379,7 +379,7 @@ virAccessDriverPolkitCheckStorageVol(virAccessManagerPtr manager,
virUUIDFormat(pool->uuid, uuidstr);
return virAccessDriverPolkitCheck(manager,
- "vol",
+ "storage-vol",
virAccessPermStorageVolTypeToString(perm),
attrs);
}
diff --git a/src/access/viraccessperm.c b/src/access/viraccessperm.c
index 17f6243be7..9c720f9e29 100644
--- a/src/access/viraccessperm.c
+++ b/src/access/viraccessperm.c
@@ -58,7 +58,7 @@ VIR_ENUM_IMPL(virAccessPermNodeDevice,
VIR_ACCESS_PERM_NODE_DEVICE_LAST,
"getattr", "read", "write",
"start", "stop",
- "dettach");
+ "detach");
VIR_ENUM_IMPL(virAccessPermNWFilter,
VIR_ACCESS_PERM_NWFILTER_LAST,
diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 2f76c95cee..fdc461b640 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -427,7 +427,7 @@ typedef enum {
* @desc: Detach node device
* @message: Detaching node device driver requires authorization
*/
- VIR_ACCESS_PERM_NODE_DEVICE_DETTACH,
+ VIR_ACCESS_PERM_NODE_DEVICE_DETACH,
VIR_ACCESS_PERM_NODE_DEVICE_LAST
} virAccessPermNodeDevice;