* query.c (start_pinentry): Use GNUPG_DERAULT_PINENTRY.
authorWerner Koch <wk@gnupg.org>
Sat, 29 Jun 2002 14:01:35 +0000 (14:01 +0000)
committerWerner Koch <wk@gnupg.org>
Sat, 29 Jun 2002 14:01:35 +0000 (14:01 +0000)
* call-scd.c (start_scd): Use GNUPG_DEFAULT_SCDAEMON.

agent/ChangeLog
agent/call-scd.c
agent/query.c

index 4f181ab..5ecd4d9 100644 (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.
index 5f7de05..af8258a 100644 (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
index c7cba5e..64333d0 100644 (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