diff --git a/g10/ChangeLog b/g10/ChangeLog index f5a54e18c..b19b50166 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2003-07-30 Werner Koch + + * g10.c (main): Disable use-agent if passphrase-fd is given + later. Suggested by Kurt Garloff. + 2003-07-28 Werner Koch * parse-packet.c (parse_key): Allow to parse the gnu-divert-to-s2k diff --git a/g10/g10.c b/g10/g10.c index d335624a7..a8d363d9c 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -1537,6 +1537,7 @@ main( int argc, char **argv ) case oCompress: opt.compress = pargs.r.ret_int; break; case oPasswdFD: pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); + opt.use_agent = 0; break; #ifdef __riscos__ case oPasswdFile: