diff options
| author | Werner Koch <[email protected]> | 2002-06-29 14:01:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-06-29 14:01:35 +0000 |
| commit | 208290552527b5b166c13b2d93933e0c41a9e7da (patch) | |
| tree | 5fe1be47f61ececd0f4684c31efa93fedc68a401 | |
| parent | Update head to match stable 1.0 (diff) | |
| download | gnupg-208290552527b5b166c13b2d93933e0c41a9e7da.tar.gz gnupg-208290552527b5b166c13b2d93933e0c41a9e7da.zip | |
* query.c (start_pinentry): Use GNUPG_DERAULT_PINENTRY.
* call-scd.c (start_scd): Use GNUPG_DEFAULT_SCDAEMON.
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/call-scd.c | 3 | ||||
| -rw-r--r-- | agent/query.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 4f181ab9b..5ecd4d9d0 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2002-06-29 Werner Koch <[email protected]> + + * query.c (start_pinentry): Use GNUPG_DERAULT_PINENTRY. + * call-scd.c (start_scd): Use GNUPG_DEFAULT_SCDAEMON. + 2002-06-28 Werner Koch <[email protected]> * protect-tool.c (export_p12_file): New. diff --git a/agent/call-scd.c b/agent/call-scd.c index 5f7de0578..af8258a0f 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -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 diff --git a/agent/query.c b/agent/query.c index c7cba5e93..64333d035 100644 --- a/agent/query.c +++ b/agent/query.c @@ -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 |