* query.c (start_pinentry): Use GNUPG_DERAULT_PINENTRY.

* call-scd.c (start_scd): Use GNUPG_DEFAULT_SCDAEMON.
This commit is contained in:
Werner Koch 2002-06-29 14:01:35 +00:00
parent 3f51f7db3d
commit 2082905525
3 changed files with 7 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2002-06-29 Werner Koch <wk@gnupg.org>
* query.c (start_pinentry): Use GNUPG_DERAULT_PINENTRY.
* call-scd.c (start_scd): Use GNUPG_DEFAULT_SCDAEMON.
2002-06-28 Werner Koch <wk@gnupg.org>
* protect-tool.c (export_p12_file): New.

View File

@ -181,9 +181,8 @@ start_scd (void)
return unlock_scd (seterr (Write_Error));
}
/* FIXME: change the default location of the program */
if (!opt.scdaemon_program || !*opt.scdaemon_program)
opt.scdaemon_program = "../scd/scdaemon";
opt.scdaemon_program = GNUPG_DEFAULT_SCDAEMON;
if ( !(pgmname = strrchr (opt.scdaemon_program, '/')))
pgmname = opt.scdaemon_program;
else

View File

@ -103,9 +103,8 @@ start_pinentry (void)
return unlock_pinentry (seterr (Write_Error));
}
/* FIXME: change the default location of the program */
if (!opt.pinentry_program || !*opt.pinentry_program)
opt.pinentry_program = "../../pinentry/kpinentry/kpinentry";
opt.pinentry_program = GNUPG_DEFAULT_PINENTRY;
if ( !(pgmname = strrchr (opt.pinentry_program, '/')))
pgmname = opt.pinentry_program;
else