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

	* src/cert-gpgsm.c (export_cert_compat, export_cert)
	(scute_gpgsm_search_certs_by_grip)
	(scute_gpgsm_search_certs_by_fpr): Call assuan_pipe_connect
	instead of assuan_pipe_connect_ext.
	* src/agent.c (agent_connect): Update use of assuan_socket_connect
	and assuan_pipe_connect.

ChangeLog

@@ -1,3 +1,12 @@
+2009-11-06  Marcus Brinkmann  <marcus@g10code.de>
+
+	* src/cert-gpgsm.c (export_cert_compat, export_cert)
+	(scute_gpgsm_search_certs_by_grip)
+	(scute_gpgsm_search_certs_by_fpr): Call assuan_pipe_connect
+	instead of assuan_pipe_connect_ext.
+	* src/agent.c (agent_connect): Update use of assuan_socket_connect
+	and assuan_pipe_connect.
+
 2009-10-16  Marcus Brinkmann  <marcus@g10code.com>
 
 	* src/p11-initialize.c (CK_DEFINE_FUNCTION): Fix code on

src/agent.c

@@ -258,7 +258,7 @@ agent_connect (assuan_context_t *ctx_r)
       if (! sockname)
 	return gpg_error_from_errno (errno);
 
-      err = assuan_socket_connect (ctx, sockname, 0);
+      err = assuan_socket_connect (ctx, sockname, 0, 0);
       if (err)
         {
 	  const char *agent_program;
@@ -292,7 +292,7 @@ agent_connect (assuan_context_t *ctx_r)
                 /* Give the agent some time to prepare itself. */
                 Sleep (3 * 1000);
                 /* Now try again to connect the agent.  */
-                err = assuan_socket_connect (ctx_r, sockname, 0);
+                err = assuan_socket_connect (ctx_r, sockname, 0, 0);
               }
           }
 #else /*!HAVE_W32_SYSTEM*/
@@ -317,7 +317,7 @@ agent_connect (assuan_context_t *ctx_r)
             
             /* Connect to the agent and perform initial handshaking. */
             err = assuan_pipe_connect (ctx, agent_program, argv,
-				       no_close_list);
+				       no_close_list, NULL, NULL, 0);
           }
 #endif /*!HAVE_W32_SYSTEM*/
         }
@@ -354,7 +354,7 @@ agent_connect (assuan_context_t *ctx_r)
 	  goto restart;
 	}
       
-      err = assuan_socket_connect (ctx, infostr, pid);
+      err = assuan_socket_connect (ctx, infostr, pid, 0);
       free (infostr);
       if (err)
 	{

src/cert-gpgsm.c

@@ -569,8 +569,8 @@ export_cert_compat (char *fpr, struct cert *cert)
       return err;
     }
 
-  err = assuan_pipe_connect_ext (ctx, get_gpgsm_path (), argv, child_fds,
-				 NULL, NULL, 128);
+  err = assuan_pipe_connect (ctx, get_gpgsm_path (), argv, child_fds,
+			     NULL, NULL, 128);
   close (output_fds[1]);
   if (err)
     {
@@ -670,8 +670,8 @@ export_cert (char *fpr, struct cert *cert)
       return err;
     }
 
-  err = assuan_pipe_connect_ext (ctx, get_gpgsm_path (), argv, NULL,
-				 NULL, NULL, 128);
+  err = assuan_pipe_connect (ctx, get_gpgsm_path (), argv, NULL,
+			     NULL, NULL, 128);
   if (err)
     {
       assuan_release (ctx);
@@ -757,8 +757,8 @@ scute_gpgsm_search_certs_by_grip (const char *grip,
       return err;
     }
 
-  err = assuan_pipe_connect_ext (ctx, get_gpgsm_path (), argv, NULL,
-				 NULL, NULL, 128);
+  err = assuan_pipe_connect (ctx, get_gpgsm_path (), argv, NULL,
+			     NULL, NULL, 128);
   if (err)
     {
       assuan_release (ctx);
@@ -797,8 +797,8 @@ scute_gpgsm_search_certs_by_fpr (const char *fpr,
       return err;
     }
 
-  err = assuan_pipe_connect_ext (ctx, get_gpgsm_path (), argv, NULL,
-				 NULL, NULL, 128);
+  err = assuan_pipe_connect (ctx, get_gpgsm_path (), argv, NULL,
+			     NULL, NULL, 128);
   if (err)
     {
       assuan_release (ctx);