From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Oct 2012 12:19:59 +0000 (+0200)
Subject: net: Change argument type of virNetworkObjIsDuplicate()
X-Git-Tag: CVE-2012-3411~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3258c0eb9e8f2bbb2d03e124d0b83469209fdb7;p=thirdparty%2Flibvirt.git

net: Change argument type of virNetworkObjIsDuplicate()

The argument check_active is used only as a boolean so this patch
changes the type and updates callers.
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 7bd7ba9db2..e9a8d0a396 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -3061,7 +3061,7 @@ cleanup:
 int
 virNetworkObjIsDuplicate(virNetworkObjListPtr doms,
                          virNetworkDefPtr def,
-                         unsigned int check_active)
+                         bool check_active)
 {
     int ret = -1;
     int dupVM = 0;
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 4c0c8c1fbf..3e463047f8 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -337,7 +337,7 @@ virNetworkObjUpdate(virNetworkObjPtr obj,
 
 int virNetworkObjIsDuplicate(virNetworkObjListPtr doms,
                              virNetworkDefPtr def,
-                             unsigned int check_active);
+                             bool check_active);
 
 void virNetworkObjLock(virNetworkObjPtr obj);
 void virNetworkObjUnlock(virNetworkObjPtr obj);
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 3dbf00987a..6f9fcdadd2 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2690,7 +2690,7 @@ static virNetworkPtr networkCreate(virConnectPtr conn, const char *xml) {
     if (!(def = virNetworkDefParseString(xml)))
         goto cleanup;
 
-    if (virNetworkObjIsDuplicate(&driver->networks, def, 1) < 0)
+    if (virNetworkObjIsDuplicate(&driver->networks, def, true) < 0)
         goto cleanup;
 
     /* Only the three L3 network types that are configured by libvirt
@@ -2749,7 +2749,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) {
     if (!(def = virNetworkDefParseString(xml)))
         goto cleanup;
 
-    if (virNetworkObjIsDuplicate(&driver->networks, def, 0) < 0)
+    if (virNetworkObjIsDuplicate(&driver->networks, def, false) < 0)
         goto cleanup;
 
     /* Only the three L3 network types that are configured by libvirt