Commit 0b682bab authored by Leigh B. Stoller's avatar Leigh B. Stoller

* Do not send SFS keys to node unless the node told us it is running

  SFS.

* Do not send SSH pubkeys to local nodes; the data is never used on
  local nodes, but along with SFS keys, comprises about 85% of the
  data we send back in the accounts request.
parent 89001ca0
......@@ -1798,6 +1798,13 @@ COMMAND_PROTOTYPE(doaccounts)
if (vers < 5)
goto skipkeys;
/*
* Locally, everything is NFS mounted so no point in
* sending back pubkey stuff; its never used.
*/
if (reqp->islocal)
goto skipsshkeys;
/*
* Need a list of keys for this user.
*/
......@@ -1857,7 +1864,12 @@ COMMAND_PROTOTYPE(doaccounts)
}
mysql_free_result(pubkeys_res);
if (vers < 6)
skipsshkeys:
/*
* Do not bother to send back SFS keys if the node is not
* running SFS.
*/
if (vers < 6 || !strlen(reqp->sfshostid))
goto skipkeys;
/*
......
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