agent/

2009-11-05  Marcus Brinkmann  <marcus@g10code.de>

	* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
	assuan_pipe_connect_ext.
	* command.c (start_command_handler): Change
	assuan_init_socket_server_ext into assuan_init_socket_server.
	* call-scd.c (start_scd): Update use of assuan_socket_connect and
	assuan_pipe_connect.
	* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
	Update use of assuan_socket_connect.

common/
2009-11-05  Marcus Brinkmann  <marcus@g10code.de>

	* asshelp.c (start_new_gpg_agent): Update use of
	assuan_socket_connect and assuan_pipe_connect.

scd/
2009-11-05  Marcus Brinkmann  <marcus@g10code.de>

	* command.c (scd_command_handler): Call assuan_init_socket_server,
	not assuan_init_socket_server_ext.

sm/
2009-11-05  Marcus Brinkmann  <marcus@g10code.de>

	* call-dirmngr.c (start_dirmngr_ext): Update use of
	assuan_pipe_connect and assuan_socket_connect.

tools/
2009-11-05  Marcus Brinkmann  <marcus@g10code.de>

	* gpg-connect-agent.c (start_agent): Update use of
	assuan_socket_connect and assuan_pipe_connect.

5 files changed, 21 insertions, 9 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 96b792e72..cebe3db51 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-05  Marcus Brinkmann  <marcus@g10code.de>
+
+	* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
+	assuan_pipe_connect_ext.
+	* command.c (start_command_handler): Change
+	assuan_init_socket_server_ext into assuan_init_socket_server.
+	* call-scd.c (start_scd): Update use of assuan_socket_connect and
+	assuan_pipe_connect.
+	* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
+	Update use of assuan_socket_connect.
+
 2009-11-04  Werner Koch  <wk@g10code.com>
 
 	* command.c (register_commands): Add help arg to
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 172a88914..c5a6f7814 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -320,8 +320,9 @@ start_pinentry (ctrl_t ctrl)
      that atfork is used to change the environment for pinentry.  We
      start the server in detached mode to suppress the console window
      under Windows.  */
-  rc = assuan_pipe_connect_ext (ctx, opt.pinentry_program, argv,
-                                no_close_list, atfork_cb, ctrl, 128);
+  rc = assuan_pipe_connect (ctx, opt.pinentry_program, argv,
+			    no_close_list, atfork_cb, ctrl,
+			    ASSUAN_PIPE_CONNECT_DETACHED);
   if (rc)
     {
       log_error ("can't connect to the PIN entry module: %s\n",
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 521086848..83b99335d 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -278,7 +278,7 @@ start_scd (ctrl_t ctrl)
 
   if (socket_name)
     {
-      rc = assuan_socket_connect (ctx, socket_name, 0);
+      rc = assuan_socket_connect (ctx, socket_name, 0, 0);
       if (rc)
         {
           log_error ("can't connect to socket `%s': %s\n",
@@ -341,8 +341,8 @@ start_scd (ctrl_t ctrl)
   /* Connect to the pinentry and perform initial handshaking.  Use
      detached flag (128) so that under W32 SCDAEMON does not show up a
      new window.  */
-  rc = assuan_pipe_connect_ext (ctx, opt.scdaemon_program, argv,
-                                no_close_list, atfork_cb, NULL, 128);
+  rc = assuan_pipe_connect (ctx, opt.scdaemon_program, argv,
+			    no_close_list, atfork_cb, NULL, 128);
   if (rc)
     {
       log_error ("can't connect to the SCdaemon: %s\n",
diff --git a/agent/command.c b/agent/command.c
index 2e4bcbff1..1c0f57467 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1924,13 +1924,13 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
     }
   else if (listen_fd != GNUPG_INVALID_FD)
     {
-      rc = assuan_init_socket_server_ext (ctx, listen_fd, 0);
+      rc = assuan_init_socket_server (ctx, listen_fd, 0);
       /* FIXME: Need to call assuan_sock_set_nonce for Windows.  But
 	 this branch is currently not used.  */
     }
   else 
     {
-      rc = assuan_init_socket_server_ext (ctx, fd, 2);
+      rc = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_ACCEPTED);
     }
   if (rc)
     {
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index be7da2009..ba7223634 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2082,7 +2082,7 @@ check_own_socket_thread (void *arg)
       goto leave;
     }
 
-  rc = assuan_socket_connect (ctx, sockname, (pid_t)(-1));
+  rc = assuan_socket_connect (ctx, sockname, (pid_t)(-1), 0);
   if (rc)
     {
       log_error ("can't connect my own socket: %s\n", gpg_strerror (rc));
@@ -2220,7 +2220,7 @@ check_for_running_agent (int silent, int mode)
 
   rc = assuan_new (&ctx);
   if (! rc)
-    rc = assuan_socket_connect (ctx, infostr, pid);
+    rc = assuan_socket_connect (ctx, infostr, pid, 0);
   xfree (infostr);
   if (rc)
     {