diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-21 00:08:26 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-21 00:08:26 -0400 |
| commit | a41b10c287cda37cbb36ae1c56afd1512ea84d00 (patch) | |
| tree | bd10da75aafa96f5d0ebf2e6722785d66860b7ef /src | |
| parent | e32ef4a7da9587ad8bd22f8ed1f517257417f713 (diff) | |
getting proper behavior from ssh-add; thanks to Jim Knoble and David Bronder for their insights.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/monkeysphere | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/monkeysphere b/src/monkeysphere index c6ecaa4..8f44bf5 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -212,7 +212,7 @@ function subkey_to_ssh_agent() { gpg --quiet --passphrase-fd 3 3<"$workingdir/passphrase" \ --export-options export-reset-subkey-passwd,export-minimal,no-export-attributes \ --export-secret-subkeys "0x${subkey}!" | openpgp2ssh "$subkey" > "$workingdir/$kname" & - (cd "$workingdir" && unset -v DISPLAY && unset -v SSH_ASKPASS && /usr/bin/setsid ssh-add "$@" "$kname" </dev/null )& + (cd "$workingdir" && DISPLAY=nosuchdisplay SSH_ASKPASS=/bin/false ssh-add "$@" "$kname" </dev/null )& passphrase_prompt "Enter passphrase for MonkeySphere Key $subkey: " "$workingdir/passphrase" wait |