From: John Ferlan <jferlan@redhat.com>
Date: Mon, 13 Apr 2015 21:11:53 +0000 (-0400)
Subject: storage: Add check for different ports for host duplicate matching
X-Git-Tag: v1.2.15-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=401623bcb420794578b93b8d5a5186653eaaf222;p=thirdparty%2Flibvirt.git

storage: Add check for different ports for host duplicate matching

In virStoragePoolSourceMatchSingleHost, add a comparison for port number
being different prior to checking the 'name' field.
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index f609f85762..313098bbe1 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2412,6 +2412,9 @@ virStoragePoolSourceMatchSingleHost(virStoragePoolSourcePtr poolsrc,
     if (poolsrc->nhost != 1 && defsrc->nhost != 1)
         return false;
 
+    if (poolsrc->hosts[0].port != defsrc->hosts[0].port)
+        return false;
+
     return STREQ(poolsrc->hosts[0].name, defsrc->hosts[0].name);
 }