[svn] GnuPG - r5201 - trunk/agent

[svn author marcus]

Author: marcus
Date: 2009-11-27 20:13:02 +0100 (Fri, 27 Nov 2009)
New Revision: 5201

Modified:
   trunk/agent/ChangeLog
   trunk/agent/command.c
   trunk/agent/gpg-agent.c
Log:
2009-11-27  Marcus Brinkmann  <marcus at g10code.de>

	* command.c (start_command_handler): Do not call
	assuan_set_log_stream anymore.
	* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2009-11-25 17:58:26 UTC (rev 5200)
+++ trunk/agent/ChangeLog	2009-11-27 19:13:02 UTC (rev 5201)
@@ -1,3 +1,9 @@
+2009-11-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* command.c (start_command_handler): Do not call
+	assuan_set_log_stream anymore.
+	* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
+
 2009-11-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* command.c (start_command_handler): Use assuan_fd_t and

Modified: trunk/agent/command.c
===================================================================
--- trunk/agent/command.c	2009-11-25 17:58:26 UTC (rev 5200)
+++ trunk/agent/command.c	2009-11-27 19:13:02 UTC (rev 5201)
@@ -1953,9 +1953,6 @@
   ctrl->server_local->use_cache_for_signing = 1;
   ctrl->digest.raw_value = 0;
 
-  if (DBG_ASSUAN)
-    assuan_set_log_stream (ctx, log_get_stream ());
-
   assuan_set_io_monitor (ctx, io_monitor, NULL);
 
   for (;;)

Modified: trunk/agent/gpg-agent.c
===================================================================
--- trunk/agent/gpg-agent.c	2009-11-25 17:58:26 UTC (rev 5200)
+++ trunk/agent/gpg-agent.c	2009-11-27 19:13:02 UTC (rev 5201)
@@ -472,6 +472,8 @@
           || strcmp (current_logfile, pargs->r.ret_str))
         {
           log_set_file (pargs->r.ret_str);
+	  if (DBG_ASSUAN)
+	    assuan_set_assuan_log_stream (log_get_stream ());
           xfree (current_logfile);
           current_logfile = xtrystrdup (pargs->r.ret_str);
         }
@@ -922,6 +924,8 @@
                              |JNLIB_LOG_WITH_PID));
       current_logfile = xstrdup (logfile);
     }
+  if (DBG_ASSUAN)
+    assuan_set_assuan_log_stream (log_get_stream ());
 
   /* Make sure that we have a default ttyname. */
   if (!default_ttyname && ttyname (1))