diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 20 | ||||
| -rw-r--r-- | sm/Makefile.am | 2 | ||||
| -rw-r--r-- | sm/call-agent.c | 6 | ||||
| -rw-r--r-- | sm/call-dirmngr.c | 2 | ||||
| -rw-r--r-- | sm/export.c | 2 | ||||
| -rw-r--r-- | sm/gpgsm.c | 8 | ||||
| -rw-r--r-- | sm/import.c | 2 | ||||
| -rw-r--r-- | sm/qualified.c | 2 |
8 files changed, 34 insertions, 10 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 20c7460be..2833c9f6b 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,23 @@ +2007-06-14 Werner Koch <[email protected]> + + * call-agent.c (start_agent): Use gnupg_module_name. + * call-dirmngr.c (start_dirmngr): Ditto. + * export.c (export_p12): Ditto. + * import.c (parse_p12): Ditto. + * gpgsm.c (run_protect_tool): Ditto. + +2007-06-12 Werner Koch <[email protected]> + + * gpgsm.c (main): Replace some calls by init_common_subsystems. + (main): Use gnupg_datadir. + * qualified.c (read_list): Use gnupg-datadir. + +2007-06-11 Werner Koch <[email protected]> + + * Makefile.am (common_libs): Use libcommaonstd macr. + + * gpgsm.c (main) [W32]: Call pth_init. + 2007-06-06 Werner Koch <[email protected]> * qualified.c (gpgsm_not_qualified_warning) [!ENABLE_NLS]: Do not diff --git a/sm/Makefile.am b/sm/Makefile.am index 0fce48a40..7e5c154ac 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -54,7 +54,7 @@ gpgsm_SOURCES = \ common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ - ../common/libcommon.a ../gl/libgnu.a + $(libcommon) ../gl/libgnu.a gpgsm_LDADD = $(common_libs) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ diff --git a/sm/call-agent.c b/sm/call-agent.c index 153f7b34f..1ac5412be 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -94,6 +94,10 @@ start_agent (ctrl_t ctrl) sockname = make_filename (opt.homedir, "S.gpg-agent", NULL); rc = assuan_socket_connect (&ctx, sockname, 0); xfree (sockname); +#ifdef HAVE_W32_SYSTEM +# warning Print a warning if connecting is not possible + /* and offer to fire up the agent. */ +#endif if (rc) { @@ -112,7 +116,7 @@ start_agent (ctrl_t ctrl) } if (!opt.agent_program || !*opt.agent_program) - opt.agent_program = GNUPG_DEFAULT_AGENT; + opt.agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT); if ( !(pgmname = strrchr (opt.agent_program, '/'))) pgmname = opt.agent_program; else diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 5cc34e132..8ce4fd8f1 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -172,7 +172,7 @@ start_dirmngr (void) int i; if (!opt.dirmngr_program || !*opt.dirmngr_program) - opt.dirmngr_program = GNUPG_DEFAULT_DIRMNGR; + opt.dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR); if ( !(pgmname = strrchr (opt.dirmngr_program, '/'))) pgmname = opt.dirmngr_program; else diff --git a/sm/export.c b/sm/export.c index 93b74bf7b..6420a2154 100644 --- a/sm/export.c +++ b/sm/export.c @@ -604,7 +604,7 @@ export_p12 (ctrl_t ctrl, const unsigned char *certimg, size_t certimglen, int bad_pass = 0; if (!opt.protect_tool_program || !*opt.protect_tool_program) - pgmname = GNUPG_DEFAULT_PROTECT_TOOL; + pgmname = gnupg_module_name (GNUPG_MODULE_NAME_PROTECT_TOOL); else pgmname = opt.protect_tool_program; diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 71559c326..0136680a8 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -747,8 +747,8 @@ main ( int argc, char **argv) somewhere after the option parsing */ log_set_prefix ("gpgsm", 1); - /* Try to auto set the character set. */ - set_native_charset (NULL); + /* Make sure that our subsystems are ready. */ + init_common_subsystems (); /* Check that the libraries are suitable. Do it here because the option parse may need services of the library */ @@ -1310,7 +1310,7 @@ main ( int argc, char **argv) /* Import the standard certificates for a new default keybox. */ char *filelist[2]; - filelist[0] = make_filename (GNUPG_DATADIR, "com-certs.pem", NULL); + filelist[0] = make_filename (gnupg_datadir (),"com-certs.pem", NULL); filelist[1] = NULL; if (!access (filelist[0], F_OK)) { @@ -1853,7 +1853,7 @@ run_protect_tool (int argc, char **argv) int i; if (!opt.protect_tool_program || !*opt.protect_tool_program) - pgm = GNUPG_DEFAULT_PROTECT_TOOL; + pgm = gnupg_module_name (GNUPG_MODULE_NAME_PROTECT_TOOL); else pgm = opt.protect_tool_program; diff --git a/sm/import.c b/sm/import.c index f5e7cf00c..687ef3183 100644 --- a/sm/import.c +++ b/sm/import.c @@ -509,7 +509,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, int bad_pass = 0; if (!opt.protect_tool_program || !*opt.protect_tool_program) - pgmname = GNUPG_DEFAULT_PROTECT_TOOL; + pgmname = gnupg_module_name (GNUPG_MODULE_NAME_PROTECT_TOOL); else pgmname = opt.protect_tool_program; diff --git a/sm/qualified.c b/sm/qualified.c index 0eabeeba4..d6d31ae95 100644 --- a/sm/qualified.c +++ b/sm/qualified.c @@ -66,7 +66,7 @@ read_list (char *key, char *country, int *lnr) if (!listname) { - listname = make_filename (GNUPG_DATADIR, "qualified.txt", NULL); + listname = make_filename (gnupg_datadir (), "qualified.txt", NULL); listfp = fopen (listname, "r"); if (!listfp && errno != ENOENT) { |