NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Maintain value of ctxt->node in virInterfaceDefParseDhcp

Browse Source 
* src/conf/interface_conf.c: This was causing subsequent calls to
  virXPathxxx() to fail, since ctxt->node was left pointing at the
  dhcp node, rather than the protocol node.
This commit is contained in:
Laine Stump 2009-09-29 11:16:04 +02:00 committed by Daniel Veillard
parent 237f3bf8da
commit c93370c4ad
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/interface_conf.c
View File

@ -227,10 +227,12 @@ virInterfaceDefParseBondArpValid(virConnectPtr conn, xmlXPathContextPtr ctxt) {
static int static int
virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def,
xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { xmlNodePtr dhcp, xmlXPathContextPtr ctxt) {
xmlNodePtr save;
char *tmp; char *tmp;
int ret = 0; int ret = 0;
def->proto.dhcp = 1; def->proto.dhcp = 1;
save = ctxt->node;
ctxt->node = dhcp; ctxt->node = dhcp;
/* Not much to do in the current version */ /* Not much to do in the current version */
tmp = virXPathString(conn, "string(./@peerdns)", ctxt); tmp = virXPathString(conn, "string(./@peerdns)", ctxt);
@ -248,6 +250,7 @@ virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def,
} else } else
def->proto.peerdns = -1; def->proto.peerdns = -1;
ctxt->node = save;
return(ret); return(ret);
} }