From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Thu, 26 Sep 2019 14:56:42 +0000 (-0300)
Subject: storage_driver.c: use virConnectValidateURIPath()
X-Git-Tag: v5.8.0-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d5b420f98768b98c9b77398dbdab707d4879c47;p=thirdparty%2Flibvirt.git

storage_driver.c: use virConnectValidateURIPath()

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Suggested-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index ce10b55ed0..d160ff34fe 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -411,21 +411,10 @@ storageConnectOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_ERROR;
     }
 
-    if (driver->privileged) {
-        if (STRNEQ(conn->uri->path, "/system")) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("unexpected storage URI path '%s', try storage:///system"),
-                           conn->uri->path);
-            return VIR_DRV_OPEN_ERROR;
-        }
-    } else {
-        if (STRNEQ(conn->uri->path, "/session")) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("unexpected storage URI path '%s', try storage:///session"),
-                           conn->uri->path);
-            return VIR_DRV_OPEN_ERROR;
-        }
-    }
+    if (!virConnectValidateURIPath(conn->uri->path,
+                                   "storage",
+                                   driver->privileged))
+        return VIR_DRV_OPEN_ERROR;
 
     if (virConnectOpenEnsureACL(conn) < 0)
         return VIR_DRV_OPEN_ERROR;