diff options
Diffstat (limited to 'src/access/viraccessmanager.c')
-rw-r--r-- | src/access/viraccessmanager.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c index 1dfff32b9d..e7b5bf38da 100644 --- a/src/access/viraccessmanager.c +++ b/src/access/viraccessmanager.c @@ -196,12 +196,11 @@ static void virAccessManagerDispose(void *object) * should the admin need to debug things */ static int -virAccessManagerSanitizeError(int ret, - const char *driverName) +virAccessManagerSanitizeError(int ret) { if (ret < 0) { virResetLastError(); - virAccessError(VIR_ERR_ACCESS_DENIED, driverName, NULL); + virAccessError(VIR_ERR_ACCESS_DENIED, NULL); } return ret; @@ -218,7 +217,7 @@ int virAccessManagerCheckConnect(virAccessManagerPtr manager, if (manager->drv->checkConnect) ret = manager->drv->checkConnect(manager, driverName, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } @@ -234,7 +233,7 @@ int virAccessManagerCheckDomain(virAccessManagerPtr manager, if (manager->drv->checkDomain) ret = manager->drv->checkDomain(manager, driverName, domain, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckInterface(virAccessManagerPtr manager, @@ -249,7 +248,7 @@ int virAccessManagerCheckInterface(virAccessManagerPtr manager, if (manager->drv->checkInterface) ret = manager->drv->checkInterface(manager, driverName, iface, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckNetwork(virAccessManagerPtr manager, @@ -264,7 +263,7 @@ int virAccessManagerCheckNetwork(virAccessManagerPtr manager, if (manager->drv->checkNetwork) ret = manager->drv->checkNetwork(manager, driverName, network, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager, @@ -279,7 +278,7 @@ int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager, if (manager->drv->checkNodeDevice) ret = manager->drv->checkNodeDevice(manager, driverName, nodedev, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckNWFilter(virAccessManagerPtr manager, @@ -294,7 +293,7 @@ int virAccessManagerCheckNWFilter(virAccessManagerPtr manager, if (manager->drv->checkNWFilter) ret = manager->drv->checkNWFilter(manager, driverName, nwfilter, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager, @@ -309,7 +308,7 @@ int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager, if (manager->drv->checkNWFilterBinding) ret = manager->drv->checkNWFilterBinding(manager, driverName, binding, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckSecret(virAccessManagerPtr manager, @@ -324,7 +323,7 @@ int virAccessManagerCheckSecret(virAccessManagerPtr manager, if (manager->drv->checkSecret) ret = manager->drv->checkSecret(manager, driverName, secret, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckStoragePool(virAccessManagerPtr manager, @@ -339,7 +338,7 @@ int virAccessManagerCheckStoragePool(virAccessManagerPtr manager, if (manager->drv->checkStoragePool) ret = manager->drv->checkStoragePool(manager, driverName, pool, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } int virAccessManagerCheckStorageVol(virAccessManagerPtr manager, @@ -355,5 +354,5 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager, if (manager->drv->checkStorageVol) ret = manager->drv->checkStorageVol(manager, driverName, pool, vol, perm); - return virAccessManagerSanitizeError(ret, driverName); + return virAccessManagerSanitizeError(ret); } |