[svn] dirmngr - r330 - in trunk: . src tests

[svn author marcus]

Author: marcus
Date: 2009-11-05 13:02:19 +0100 (Thu, 05 Nov 2009)
New Revision: 330

Modified:
   trunk/ChangeLog
   trunk/src/ChangeLog
   trunk/src/dirmngr-client.c
   trunk/src/server.c
   trunk/tests/test-dirmngr.c
Log:
2009-11-05  Marcus Brinkmann  <marcus at g10code.de>

	* tests/test-dirmngr.c (start_dirmngr): Update use
	assuan_pipe_connect.

src/
2009-11-05  Marcus Brinkmann  <marcus at g10code.de>

	* server.c (start_command_handler): Update use of
	assuan_init_socket_server.
	* dirmngr-client.c (start_dirmngr): Update use of
	assuan_pipe_connect and assuan_socket_connect.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-04 10:32:21 UTC (rev 329)
+++ trunk/ChangeLog	2009-11-05 12:02:19 UTC (rev 330)
@@ -1,3 +1,8 @@
+2009-11-05  Marcus Brinkmann  <marcus at g10code.de>
+
+	* tests/test-dirmngr.c (start_dirmngr): Update use
+	assuan_pipe_connect.
+
 2009-10-16  Marcus Brinkmann  <marcus at g10code.com>
 
 	* configure.ac: Test for libassuan instead of libassuan-pth.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-11-04 10:32:21 UTC (rev 329)
+++ trunk/src/ChangeLog	2009-11-05 12:02:19 UTC (rev 330)
@@ -1,3 +1,10 @@
+2009-11-05  Marcus Brinkmann  <marcus at g10code.de>
+
+	* server.c (start_command_handler): Update use of
+	assuan_init_socket_server.
+	* dirmngr-client.c (start_dirmngr): Update use of
+	assuan_pipe_connect and assuan_socket_connect.
+
 2009-11-04  Werner Koch  <wk at g10code.com>
 
 	* server.c (register_commands): Add help arg to

Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c	2009-11-04 10:32:21 UTC (rev 329)
+++ trunk/src/dirmngr-client.c	2009-11-05 12:02:19 UTC (rev 330)
@@ -505,7 +505,7 @@
 
       /* Connect to the agent and perform initial handshaking.  */
       rc = assuan_pipe_connect (ctx, opt.dirmngr_program, argv,
-                                no_close_list);
+                                no_close_list, NULL, NULL, 0);
     }
   else /* Connect to a daemon.  */
     {
@@ -544,7 +544,7 @@
       else
         pid = -1;
 
-      rc = assuan_socket_connect (ctx, infostr, pid);
+      rc = assuan_socket_connect (ctx, infostr, pid, 0);
       xfree (infostr);
       if (gpg_err_code(rc) == GPG_ERR_ASS_CONNECT_FAILED && !only_daemon)
         {

Modified: trunk/src/server.c
===================================================================
--- trunk/src/server.c	2009-11-04 10:32:21 UTC (rev 329)
+++ trunk/src/server.c	2009-11-05 12:02:19 UTC (rev 330)
@@ -1369,7 +1369,7 @@
     }
   else
     {
-      rc = assuan_init_socket_server_ext (ctx, fd, 2);
+      rc = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_ACCEPTED);
     }
 
   if (rc)
@@ -1433,13 +1433,12 @@
 #ifndef HAVE_W32_SYSTEM
       if (opt.verbose)
         {
-          pid_t apid;
-          uid_t auid;
-          gid_t agid;
+	  assuan_peercred_t peercred;
 
-          if (!assuan_get_peercred (ctx, &apid, &auid, &agid))
+          if (!assuan_get_peercred (ctx, &peercred))
             log_info ("connection from process %ld (%ld:%ld)\n",
-                      (long)apid, (long)auid, (long)agid);
+                      (long)peercred->pid, (long)peercred->uid,
+		      (long)peercred->gid);
         }
 #endif
 

Modified: trunk/tests/test-dirmngr.c
===================================================================
--- trunk/tests/test-dirmngr.c	2009-11-04 10:32:21 UTC (rev 329)
+++ trunk/tests/test-dirmngr.c	2009-11-05 12:02:19 UTC (rev 330)
@@ -62,7 +62,7 @@
       return -1;
     }
 
-  rc = assuan_pipe_connect (ctx, pgmname, argv, 0);
+  rc = assuan_pipe_connect (ctx, pgmname, argv, NULL, NULL, NULL, 0);
   if (rc)
     {
       assuan_release (ctx);