getting proper behavior from ssh-add; thanks to Jim Knoble and David Bronder for...
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 04:08:26 +0000 (00:08 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 04:08:26 +0000 (00:08 -0400)
src/monkeysphere

index c6ecaa4d88ae014752de71856c1dae146a476057..8f44bf51ed9cc8e56c0331bfd7d97a1be4dfe9b1 100755 (executable)
@@ -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