diff options
| -rw-r--r-- | sm/ChangeLog | 4 | ||||
| -rw-r--r-- | sm/call-dirmngr.c | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 88d9763c8..764faa67d 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2006-02-17 Werner Koch <[email protected]> + + * call-dirmngr.c (start_dirmngr): Print name of dirmngr to be started. + 2005-11-23 Werner Koch <[email protected]> * gpgsm.h: New member QUALSIG_APPROVAL. diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index dd38a889b..85467d4a2 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -170,8 +170,16 @@ start_dirmngr (void) int no_close_list[3]; int i; + if (!opt.dirmngr_program || !*opt.dirmngr_program) + opt.dirmngr_program = GNUPG_DEFAULT_DIRMNGR; + if ( !(pgmname = strrchr (opt.dirmngr_program, '/'))) + pgmname = opt.dirmngr_program; + else + pgmname++; + if (opt.verbose) - log_info (_("no running dirmngr - starting one\n")); + log_info (_("no running dirmngr - starting `%s'\n"), + opt.dirmngr_program); if (fflush (NULL)) { @@ -180,13 +188,6 @@ start_dirmngr (void) return tmperr; } - if (!opt.dirmngr_program || !*opt.dirmngr_program) - opt.dirmngr_program = GNUPG_DEFAULT_DIRMNGR; - if ( !(pgmname = strrchr (opt.dirmngr_program, '/'))) - pgmname = opt.dirmngr_program; - else - pgmname++; - argv[0] = pgmname; argv[1] = "--server"; argv[2] = NULL; |