summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/assuan-socket-server.c12
-rw-r--r--src/server.c1
2 files changed, 6 insertions, 7 deletions
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 4e255c2..e1e0c60 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -108,12 +108,12 @@ accept_connection_bottom (assuan_context_t ctx)
socklen_t unpl = sizeof unp;
if (getsockopt (fd, 0, LOCAL_PEEREID, &unp, &unpl) != -1)
- {
- ctx->peercred_valid = 1;
- ctx->peercred.pid = unp.unp_pid;
- ctx->peercred.uid = unp.unp_euid;
- ctx->peercred.gid = unp.unp_egid;
- }
+ {
+ ctx->peercred_valid = 1;
+ ctx->peercred.pid = unp.unp_pid;
+ ctx->peercred.uid = unp.unp_euid;
+ ctx->peercred.gid = unp.unp_egid;
+ }
}
#elif defined (HAVE_GETPEERUCRED)
{ /* Solaris */
diff --git a/src/server.c b/src/server.c
index 7c82f02..5e96798 100644
--- a/src/server.c
+++ b/src/server.c
@@ -46,7 +46,6 @@ _assuan_server_finish (assuan_context_t ctx)
}
if (ctx->pid != ASSUAN_INVALID_PID && ctx->pid)
{
- _assuan_waitpid (ctx, ctx->pid, ctx->flags.no_waitpid, NULL, 0);
ctx->pid = ASSUAN_INVALID_PID;
}