2009-11-05 Marcus Brinkmann <[email protected]>

	* tests/fdpassing.c (main): Call assuan_pipe_connect instead
	of assuan_pipe_connect_ext.

doc/
2009-11-05  Marcus Brinkmann  <[email protected]>

	* assuan.texi (Client code): Document
	ASSUAN_PIPE_CONNECT_FDPASSING and ASSUAN_PIPE_CONNECT_DETACHED.
	(Server code): Document ASSUAN_SOCKET_SERVER_FDPASSING and
	ASSUAN_SOCKET_SERVER_ACCEPTED.
	(Utilities): Update documentation of assuan_get_peercred.

src/
2009-11-05  Marcus Brinkmann  <[email protected]>

	* assuan.h (struct _assuan_peercred, assuan_peercred_t): New.
	(assuan_get_peercred): Define on all systems, return
	assuan_peercred_t.
	* assuan-defs.h (struct assuan_context_s): Move valid flag out of
	peercred struct, use struct _assuan_peercred.
	* libassuan.def: Add assuan_get_peercred.
	* assuan-connect.c (assuan_get_peercred): Moved to ...
	* context.c (assuan_get_peercred): ... here.  Reimplement.
	* assuan-socket-server.c (accept_connection_bottom): Adjust access
	to peercred in context.
	* assuan.h (ASSUAN_PIPE_CONNECT_FDPASSING)
	(ASSUAN_PIPE_CONNECT_DETACHED, ASSUAN_SOCKET_SERVER_FDPASSING)
	(ASSUAN_SOCKET_SERVER_ACCEPTED, ASSUAN_SOCKET_CONNECT_FDPASSING): New.
	(assuan_pipe_connect_ext): Renamed to ...
	(assuan_pipe_connect): ... this, overwriting old prototype.
	(assuan_socket_connect_ext): Renamed to ...
	(assuan_socket_connect): ... this, overwriting old prototype.
	(assuan_init_socket_server_ext): Renamed to ...
	(assuan_init_socket_server): ... this, overwriting old prototype.
	* assuan-pipe-connect.c: Likewise for functions.
	* assuan-socket-connect.c: Likewise.
	* assuan-socket-server.c: Likewise.
	* libassuan.def (assuan_init_socket_server_ext)
	(assuan_pipe_connect_ext, assuan_socket_connect_ext): Removed.
	* libassuan.vers: Likewise.

1 files changed, 4 insertions, 12 deletions

diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 3487b19..2dbfa9f 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -46,7 +46,7 @@ accept_connection_bottom (assuan_context_t ctx)
 {
   assuan_fd_t fd = ctx->connected_fd;
 
-  ctx->peercred.valid = 0;
+  ctx->peercred_valid = 0;
 #ifdef HAVE_SO_PEERCRED
   {
     struct ucred cr; 
@@ -57,7 +57,7 @@ accept_connection_bottom (assuan_context_t ctx)
          ctx->peercred.pid = cr.pid;
          ctx->peercred.uid = cr.uid;
          ctx->peercred.gid = cr.gid;
-         ctx->peercred.valid = 1;
+         ctx->peercred_valid = 1;
 
          /* This overrides any already set PID if the function returns
             a valid one. */
@@ -137,22 +137,14 @@ deinit_socket_server (assuan_context_t ctx)
   ctx->cmdtbl = NULL;
 }
 
-/* Initialize a server for the socket LISTEN_FD which has already be
-   put into listen mode */
-gpg_error_t
-assuan_init_socket_server (assuan_context_t ctx, assuan_fd_t listen_fd)
-{
-  return assuan_init_socket_server_ext (ctx, listen_fd, 0);
-}
-
 
 /* 
    Flag bits: 0 - use sendmsg/recvmsg to allow descriptor passing
               1 - FD has already been accepted.
 */
 gpg_error_t
-assuan_init_socket_server_ext (assuan_context_t ctx, assuan_fd_t fd,
-                               unsigned int flags)
+assuan_init_socket_server (assuan_context_t ctx, assuan_fd_t fd,
+			   unsigned int flags)
 {
   gpg_error_t rc;