diff options
| author | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
| commit | 17e67cd29b94821892464537873a88bb6959c937 (patch) | |
| tree | 3ef1b99467f10988fbf6cf1ec6fb77c32d607bff /g10/g10.c | |
| parent | * idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on native (diff) | |
| download | gnupg-17e67cd29b94821892464537873a88bb6959c937.tar.gz gnupg-17e67cd29b94821892464537873a88bb6959c937.zip | |
* passphrase.c (agent_send_all_options): Make use of $GPG_TTY.
* g10.c (main): Disable use-agent if passphrase-fd is given later.
Suggested by Kurt Garloff.
* exec.c, g10.c, gpgv.c, passphrase.c, photoid.c: s/__MINGW32__/_WIN32/ to
help building on native Windows compilers. Requested by Brian Gladman.
From Werner on stable branch.
Diffstat (limited to '')
| -rw-r--r-- | g10/g10.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1186,8 +1186,7 @@ main( int argc, char **argv ) VERIFY_SHOW_POLICY|VERIFY_SHOW_NOTATION|VERIFY_SHOW_KEYSERVER; opt.trust_model=TM_AUTO; opt.mangle_dos_filenames = 1; - -#if defined (__MINGW32__) +#if defined (_WIN32) set_homedir ( read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" )); #else @@ -1530,7 +1529,7 @@ main( int argc, char **argv ) break; case oLoadExtension: #ifndef __riscos__ -#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__) +#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32) if(check_permissions(pargs.r.ret_str,2)) log_info(_("cipher extension \"%s\" not loaded due to " "unsafe permissions\n"),pargs.r.ret_str); @@ -1665,6 +1664,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: |