diff options
Diffstat (limited to 'src/subcommands/m')
| -rw-r--r-- | src/subcommands/m/ssh_proxycommand | 25 | ||||
| -rw-r--r-- | src/subcommands/m/subkey_to_ssh_agent | 3 |
2 files changed, 7 insertions, 21 deletions
diff --git a/src/subcommands/m/ssh_proxycommand b/src/subcommands/m/ssh_proxycommand index 56a266e..7239c7a 100644 --- a/src/subcommands/m/ssh_proxycommand +++ b/src/subcommands/m/ssh_proxycommand @@ -15,27 +15,10 @@ # established. Can be added to ~/.ssh/config as follows: # ProxyCommand monkeysphere-ssh-proxycommand %h %p -######################################################################## -PGRM=$(basename $0) - -SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"} -export SYSSHAREDIR -. "${SYSSHAREDIR}/common" || exit 1 - -######################################################################## -# FUNCTIONS -######################################################################## - -usage() { - cat <<EOF >&2 -usage: ssh -o ProxyCommand="$(basename $0) %h %p" ... -EOF -} - -log() { - echo "$@" >&2 -} +ssh_proxycommand() { +# "marginal case" ouput in the case that there is not a full +# validation path to the host output_no_valid_key() { local sshKeyOffered local userID @@ -250,3 +233,5 @@ if [ -z "$NO_CONNECT" ] ; then exit 255 fi fi + +} diff --git a/src/subcommands/m/subkey_to_ssh_agent b/src/subcommands/m/subkey_to_ssh_agent index 9bedb5e..012c95f 100644 --- a/src/subcommands/m/subkey_to_ssh_agent +++ b/src/subcommands/m/subkey_to_ssh_agent @@ -44,7 +44,8 @@ For more details, see: failure "Could not connect to ssh-agent" fi - # get list of secret keys (to work around https://bugs.g10code.com/gnupg/issue945): + # get list of secret keys (to work around bug + # https://bugs.g10code.com/gnupg/issue945): secretkeys=$(gpg --list-secret-keys --with-colons --fixed-list-mode --fingerprint | \ grep '^fpr:' | cut -f10 -d: | awk '{ print "0x" $1 "!" }') |