Commit 2b2c7bd3 authored by Kirk Webb's avatar Kirk Webb

Fix account listing for vnodes on shared hosts.

In my cleanup of the "doaccounts" code, it looks like I was a bit
overzealous. The logic for detecting when a node is a shared vnode
host was incomplete, and so matched for the vnodes themselves too.
parent ab7da9fd
......@@ -2612,7 +2612,7 @@ COMMAND_PROTOTYPE(doaccounts)
2, reqp->nodeid, RELOADPID);
}
else if ((reqp->jailflag && !reqp->islocal) ||
(reqp->islocal && reqp->sharing_mode[0]) ||
(reqp->islocal && reqp->sharing_mode[0] && !reqp->isvnode) ||
HAS_TAINT(reqp->taintstates, TB_TAINTSTATE_BLACKBOX)) {
/*
* This is for a remote node doing jails, a shared host, or
......@@ -2772,7 +2772,7 @@ COMMAND_PROTOTYPE(doaccounts)
18, reqp->nodeid);
}
else if ((reqp->jailflag && !reqp->islocal) ||
(reqp->islocal && reqp->sharing_mode[0]) ||
(reqp->islocal && reqp->sharing_mode[0] && !reqp->isvnode) ||
HAS_TAINT(reqp->taintstates, TB_TAINTSTATE_BLACKBOX)) {
/*
* A remote node doing jails, a local node being
......
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