diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-19 22:42:43 -0500 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-19 22:42:43 -0500 |
| commit | e13bbc823bc8fe7a28303e45055643e15d0849cd (patch) | |
| tree | 29a8318fed9d344c637eec3ef8dd0df9cacaae11 /src/share/m/ssh_proxycommand | |
| parent | 826bfb547cc82252f18e63a25bb7ee5aeaaebc72 (diff) | |
| parent | 21e298b8df5108b1337d66ba1a39184be4ce0e4e (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/share/m/ssh_proxycommand')
| -rw-r--r-- | src/share/m/ssh_proxycommand | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 0a81500..bd09588 100644 --- a/src/share/m/ssh_proxycommand +++ b/src/share/m/ssh_proxycommand @@ -43,7 +43,7 @@ EOF # 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) @@ -71,7 +71,7 @@ EOF 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") @@ -171,7 +171,7 @@ URI="ssh://${HOSTP}" # 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"} |