Commit 92bd0358 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor bug fix that prevented tunnels from being given to xen VMs.

parent 4ba9334f
...@@ -2255,15 +2255,7 @@ COMMAND_PROTOTYPE(doifconfig) ...@@ -2255,15 +2255,7 @@ COMMAND_PROTOTYPE(doifconfig)
reqp->nodeid); reqp->nodeid);
return 1; return 1;
} }
if ((nrows = (int)mysql_num_rows(res)) == 0) { nrows = (int)mysql_num_rows(res);
mysql_free_result(res);
/* XXX not sure why this is ever an error? */
if (!reqp->isplabdslice && num_interfaces == 0) {
error("%s: IFCONFIG: No interfaces!\n", reqp->nodeid);
return 1;
}
return 0;
}
while (nrows) { while (nrows) {
char *bufp = buf; char *bufp = buf;
char *ifacetype; char *ifacetype;
...@@ -2380,7 +2372,6 @@ COMMAND_PROTOTYPE(doifconfig) ...@@ -2380,7 +2372,6 @@ COMMAND_PROTOTYPE(doifconfig)
} }
mysql_free_result(res); mysql_free_result(res);
/* /*
* Containers do not see egre/gre tunnels, they see plain interfaces, * Containers do not see egre/gre tunnels, they see plain interfaces,
* since the tunnel was set up in root (dom0) context. This applies to * since the tunnel was set up in root (dom0) context. This applies to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment