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 18f7cf9493da8762870caa940d82990e76c3023b..31abf128905fd7431bbc4989f7c8d1e1d2e78d54 100644 (file)
--- 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)