aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-04-05 17:09:13 +0000
committerWerner Koch <[email protected]>2005-04-05 17:09:13 +0000
commit80f4424658f055e9738dcfca1ef1a5bd27797189 (patch)
tree77f5fe724d2ff69b5b549ffe0b836a38e97ad8cf /g10/g10.c
parent* mainproc.c (proc_plaintext): Properly handle SIG+LITERAL (old-style PGP) (diff)
downloadgnupg-80f4424658f055e9738dcfca1ef1a5bd27797189.tar.gz
gnupg-80f4424658f055e9738dcfca1ef1a5bd27797189.zip
Changes to make use of code taken from libassuan. This replaces the
old ad-hoc connection code to gpg-agent. We do need this for the forthcoming diversion of card code to an already running gpg-agent with card-support.
Diffstat (limited to '')
-rw-r--r--g10/g10.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 79a1e2008..fefb8ab97 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2591,6 +2591,14 @@ main( int argc, char **argv )
"--no-literal" );
}
+#ifndef ENABLE_AGENT_SUPPORT
+ if (opt.use_agent) {
+ log_info(_("NOTE: %s is not available in this version\n"),
+ "--use-agent");
+ opt.use_agent = 0;
+ }
+#endif /*!ENABLE_AGENT_SUPPORT*/
+
if (opt.set_filesize)
log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
if( opt.batch )