From df882c1e7e63fc658d0296dbd272499923fc4c69 Mon Sep 17 00:00:00 2001 From: Jameson Rollins Date: Mon, 18 Oct 2010 09:55:53 -0400 Subject: Simplification/refactoring of key/file processing This is a fairly major overhaul to greatly reduce the number of redundant code paths. We here created a new process_keys_for_file function that processes key from a userid for a given key file. All the main top elevel functions now call this one function. The main top level monkeysphere functions for updating the user's authorized_keys and known_hosts files are now moved to their own sourced files, which greatly reduces the amount of code sourced with common. monkeysphere now updates authorized_keys and known_hosts in temporary files that are then atomically moved into place upon completion. Finally, removed the confusing return codes in the key/file processing functions that were based on number of valid/invalid keys processed. It was confusing in the presence of actual errors that stopped processing. --- src/share/m/ssh_proxycommand | 1 + 1 file changed, 1 insertion(+) (limited to 'src/share/m/ssh_proxycommand') diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 5fb2ce4..a4c01c6 100644 --- a/src/share/m/ssh_proxycommand +++ b/src/share/m/ssh_proxycommand @@ -272,6 +272,7 @@ CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER} # update the known_hosts file for the host local returnCode=0 +source "${MSHAREDIR}/update_known_hosts" update_known_hosts "$HOSTP" || returnCode="$?" # output on depending on the return of the update-known_hosts -- cgit v1.2.3