Commit 6bb9bf9e authored by Mike Hibler's avatar Mike Hibler

Merge branch 'master' into arm64

parents 694b5adb 2b2c7bd3
......@@ -2613,7 +2613,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
......@@ -2773,7 +2773,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