Debug message cleanups.

5 files changed, 18 insertions, 7 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index a594885e0..634bb2230 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-26  Werner Koch  <wk@gnupg.org>
+
+	* gpgsm.h (DBG_AGENT,DBG_AGENT_VALUE): Replaced by DBG_ASSUAN_*.
+	Changed all users.
+
+	* call-agent.c (start_agent): Be more silent without -v.
+	* call-dirmngr.c (start_dirmngr): Ditto.
+
 2002-04-25  Werner Koch  <wk@gnupg.org>
 
 	* call-agent.c (start_agent): Make copies of old locales and check
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 11b88f183..e11053220 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -151,7 +151,9 @@ start_agent (void)
     {
       const char *pgmname;
       const char *argv[3];
-      log_info (_("no running gpg-agent - starting one\n"));
+
+      if (opt.verbose)
+        log_info (_("no running gpg-agent - starting one\n"));
 
       if (fflush (NULL))
         {
@@ -217,7 +219,7 @@ start_agent (void)
     }
   agent_ctx = ctx;
 
-  if (DBG_AGENT)
+  if (DBG_ASSUAN)
     log_debug ("connection to agent established\n");
 
   rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 172a4d027..29f7a1d8e 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -70,7 +70,8 @@ start_dirmngr (void)
       const char *pgmname;
       const char *argv[3];
 
-      log_info (_("no running dirmngr - starting one\n"));
+      if (opt.verbose)
+        log_info (_("no running dirmngr - starting one\n"));
       
       if (fflush (NULL))
         {
@@ -136,7 +137,7 @@ start_dirmngr (void)
     }
   dirmngr_ctx = ctx;
 
-  if (DBG_AGENT)
+  if (DBG_ASSUAN)
     log_debug ("connection to dirmngr established\n");
   return 0;
 }
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 0683fd12f..f0630ca38 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -89,14 +89,14 @@ struct {
 #define DBG_CACHE_VALUE   64	/* debug the caching */
 #define DBG_MEMSTAT_VALUE 128	/* show memory statistics */
 #define DBG_HASHING_VALUE 512	/* debug hashing operations */
-#define DBG_AGENT_VALUE  1024   /* debug communication with the agent */
+#define DBG_ASSUAN_VALUE  1024  /* debug assuan communication */
 
 #define DBG_X509    (opt.debug & DBG_X509_VALUE)
 #define DBG_CRYPTO  (opt.debug & DBG_CRYPTO_VALUE)
 #define DBG_MEMORY  (opt.debug & DBG_MEMORY_VALUE)
 #define DBG_CACHE   (opt.debug & DBG_CACHE_VALUE)
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
-#define DBG_AGENT   (opt.debug & DBG_AGENT_VALUE)
+#define DBG_ASSUAN   (opt.debug & DBG_ASSUAN_VALUE)
 
 struct server_local_s;
 
diff --git a/sm/server.c b/sm/server.c
index 54558ed8d..5ebd5477c 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -655,7 +655,7 @@ gpgsm_server (void)
   ctrl.server_local->assuan_ctx = ctx;
   ctrl.server_local->message_fd = -1;
 
-  if (DBG_AGENT)
+  if (DBG_ASSUAN)
     assuan_set_log_stream (ctx, log_get_stream ());
 
   for (;;)