On Sun, Nov 30, 2008 at 04:30:00PM -0500, Jack Dodds wrote:
> the GPG_AGENT_INFO variable. In that situation, Enigmail requests the
> passphrase directly. i.e. Enigmail falls back to a direct passphrase
> request if it can't find GPG_AGENT_INFO, but it does not fall back if it
> gets a name for the gpg-agent socket and fails to connect using that name=
> =2E
>
I think i have a patch now.
It takes care that this agent feature is not used before gpg
2. attached. please test and provide feedback.
- Alexander
#!/bin/sh -e
## by Alexander Sack <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts < $0;;
-unpatch) patch $patch_opts -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
exit 1;;
esac
exit 0
@DPATCH@
--- mozilla/extensions/enigmail/package/enigmail.js.bak 2008-12-01
03:19:41.000000000 +0100
+++ mozilla/extensions/enigmail/package/enigmail.js 2008-12-01
03:20:33.000000000 +0100
@@ -1347,16 +1347,19 @@
this.stillActive();
this.initialized = true;
DEBUG_LOG("enigmail.js: Enigmail.initialize: END\n");
}
Enigmail.prototype.useGpgAgent =
function() {
+ if(this.agentVersion < "2.0")
+ return false;
+
var useAgent = false;
try {
useAgent= (this.gpgAgentInfo.envStr.length>0 ||
this.prefBranch.getBoolPref("useGpgAgent"));
}
catch (ex) {}
return useAgent;
}
