External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 07:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix improper error return in virInterfaceDefParseProtoIPvX

Browse Source 
* src/conf/interface_conf.c: the code was erronously returning -1
  in the two functions if <dhcp> is not provided
This commit is contained in:
Laine Stump 2009-11-03 21:01:32 +01:00 committed by Daniel Veillard
parent 468439854b
commit af1e2ede26
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/interface_conf.c
View File

@ -310,10 +310,11 @@ virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceProtocolDefPtr def
def->gateway = tmp; def->gateway = tmp;
dhcp = virXPathNode(conn, "./dhcp", ctxt); dhcp = virXPathNode(conn, "./dhcp", ctxt);
if (dhcp != NULL) if (dhcp != NULL) {
ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt); ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt);
if (ret != 0) if (ret != 0)
return(ret); return(ret);
}
nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes);
if (ipNodes == NULL) if (ipNodes == NULL)
@ -366,10 +367,11 @@ virInterfaceDefParseProtoIPv6(virConnectPtr conn, virInterfaceProtocolDefPtr def
def->autoconf = 1; def->autoconf = 1;
dhcp = virXPathNode(conn, "./dhcp", ctxt); dhcp = virXPathNode(conn, "./dhcp", ctxt);
if (dhcp != NULL) if (dhcp != NULL) {
ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt); ret = virInterfaceDefParseDhcp(conn, def, dhcp, ctxt);
if (ret != 0) if (ret != 0)
return(ret); return(ret);
}
nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes);
if (ipNodes == NULL) if (ipNodes == NULL)