From: John Ferlan <jferlan@redhat.com>
Date: Mon, 11 May 2015 14:19:39 +0000 (-0400)
Subject: conf: Adjust duplicate source host port check
X-Git-Tag: v1.2.16-rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dd9297c88c8898a2505bc3bb95fb62d577e7c25;p=thirdparty%2Flibvirt.git

conf: Adjust duplicate source host port check

Only perform the port number check if the incoming definition actually
provides it. Since the port number is optional we could erroneously pass
a duplicate source host check since some storage pool backends which fill
in the default port number (e.g., iSCSI and sheepdog) for the started pool.
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 4852dfbf02..61365b9ca4 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2412,7 +2412,8 @@ virStoragePoolSourceMatchSingleHost(virStoragePoolSourcePtr poolsrc,
     if (poolsrc->nhost != 1 && defsrc->nhost != 1)
         return false;
 
-    if (poolsrc->hosts[0].port != defsrc->hosts[0].port)
+    if (defsrc->hosts[0].port &&
+        poolsrc->hosts[0].port != defsrc->hosts[0].port)
         return false;
 
     return STREQ(poolsrc->hosts[0].name, defsrc->hosts[0].name);