From: Laine Stump <laine@laine.org>
Date: Tue, 3 Nov 2009 20:01:32 +0000 (+0100)
Subject: Fix improper error return in virInterfaceDefParseProtoIPvX
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=af1e2ede261c0f9bf9ef0c09d6e73aefed2bed78;p=libvirt.git

Fix improper error return in virInterfaceDefParseProtoIPvX

* src/conf/interface_conf.c: the code was erronously returning -1
  in the two functions if <dhcp> is not provided
---

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 18f7cf9493..31abf12890 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -310,10 +310,11 @@ virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceProtocolDefPtr def
     def->gateway = tmp;
 
     dhcp = virXPathNode(conn, "./dhcp", ctxt);
-    if (dhcp != NULL)
+    if (dhcp != NULL) {
         ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt);
-    if (ret != 0)
-        return(ret);
+        if (ret != 0)
+           return(ret);
+    }
 
     nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes);
     if (ipNodes == NULL)
@@ -366,10 +367,11 @@ virInterfaceDefParseProtoIPv6(virConnectPtr conn, virInterfaceProtocolDefPtr def
         def->autoconf = 1;
 
     dhcp = virXPathNode(conn, "./dhcp", ctxt);
-    if (dhcp != NULL)
+    if (dhcp != NULL) {
         ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt);
-    if (ret != 0)
-        return(ret);
+        if (ret != 0)
+           return(ret);
+    }
 
     nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes);
     if (ipNodes == NULL)