From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 21 Aug 2008 04:08:26 +0000 (-0400)
Subject: getting proper behavior from ssh-add; thanks to Jim Knoble and David Bronder for... 
X-Git-Tag: monkeysphere_0.11-1~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a41b10c287cda37cbb36ae1c56afd1512ea84d00;p=monkeysphere.git

getting proper behavior from ssh-add; thanks to Jim Knoble and David Bronder for their insights.
---

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