projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
m
/
ssh_proxycommand
diff --git
a/src/share/m/ssh_proxycommand
b/src/share/m/ssh_proxycommand
index e07b637d26ce79debc7c34131aba0d6a652cc598..bd095889e528f61b0a75a503fcb5a12ba7942c57 100644
(file)
--- a/
src/share/m/ssh_proxycommand
+++ b/
src/share/m/ssh_proxycommand
@@
-43,7
+43,7
@@
EOF
# found?
# get the gpg info for userid
# found?
# get the gpg info for userid
- gpgOut=$(gpg --list-key --fixed-list-mode --with-colon \
+ gpgOut=$(gpg
_user
--list-key --fixed-list-mode --with-colon \
--with-fingerprint --with-fingerprint \
="$userID" 2>/dev/null)
--with-fingerprint --with-fingerprint \
="$userID" 2>/dev/null)
@@
-66,12
+66,12
@@
EOF
sshKeyGPGFile=$(msmktempfile)
printf "%s" "$sshKeyGPG" >"$sshKeyGPGFile"
sshKeyGPGFile=$(msmktempfile)
printf "%s" "$sshKeyGPG" >"$sshKeyGPGFile"
- sshFingerprint=$(ssh-keygen -l -f "$sshKeyGPGFile" \
+ sshFingerprint=$(ssh-keygen -l -f "$sshKeyGPGFile"
|
\
awk '{ print $2 }')
rm -f "$sshKeyGPGFile"
# get the sigs for the matching key
awk '{ print $2 }')
rm -f "$sshKeyGPGFile"
# get the sigs for the matching key
- gpgSigOut=$(gpg --check-sigs \
+ gpgSigOut=$(gpg
_user
--check-sigs \
--list-options show-uid-validity \
"$keyid")
--list-options show-uid-validity \
"$keyid")
@@
-171,7
+171,7
@@
URI="ssh://${HOSTP}"
# CHECK_KEYSERVER variable in the monkeysphere.conf file.
# if the host is in the gpg keyring...
# CHECK_KEYSERVER variable in the monkeysphere.conf file.
# if the host is in the gpg keyring...
-if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
+if gpg
_user
--list-key ="${URI}" 2>&1 >/dev/null ; then
# do not check the keyserver
CHECK_KEYSERVER=${CHECK_KEYSERVER:="false"}
# do not check the keyserver
CHECK_KEYSERVER=${CHECK_KEYSERVER:="false"}