[svn] GnuPG - r4008 - branches/GNUPG-1-9-BRANCH/sm

[svn author wk]

Author: wk
Date: 2006-02-19 23:09:10 +0100 (Sun, 19 Feb 2006)
New Revision: 4008

Modified:
   branches/GNUPG-1-9-BRANCH/sm/ChangeLog
   branches/GNUPG-1-9-BRANCH/sm/call-dirmngr.c
Log:
Better warning messages


Modified: branches/GNUPG-1-9-BRANCH/sm/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/ChangeLog	2006-02-19 21:03:01 UTC (rev 4007)
+++ branches/GNUPG-1-9-BRANCH/sm/ChangeLog	2006-02-19 22:09:10 UTC (rev 4008)
@@ -1,3 +1,7 @@
+2006-02-17  Werner Koch  <wk at g10code.com>
+
+	* call-dirmngr.c (start_dirmngr): Print name of dirmngr to be started.
+
 2005-11-23  Werner Koch  <wk at g10code.com>
 
 	* gpgsm.h: New member QUALSIG_APPROVAL.

Modified: branches/GNUPG-1-9-BRANCH/sm/call-dirmngr.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/call-dirmngr.c	2006-02-19 21:03:01 UTC (rev 4007)
+++ branches/GNUPG-1-9-BRANCH/sm/call-dirmngr.c	2006-02-19 22:09:10 UTC (rev 4008)
@@ -170,8 +170,16 @@
       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 @@
           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;