From aa4bf4140023dc009753a7b1ea41e85dbb18dd16 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 8 Dec 2015 10:20:20 +0100 Subject: [PATCH] privops: use SOCK_SEQPACKET sockets when supported SOCK_SEQPACKET is preferred over SOCK_DGRAM for communication with the helper as the process will get an error when the other end of the socket is closed. It's not supported on all platforms. If SOCK_SEQPACKET is defined, try creating the pair of sockets with this type first and if that fails, fall back to SOCK_DGRAM. --- privops.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/privops.c b/privops.c index d53583c..82b5660 100644 --- a/privops.c +++ b/privops.c @@ -450,7 +450,11 @@ PRV_Initialise(void) if (have_helper()) LOG_FATAL(LOGF_PrivOps, "Helper already running"); - if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock_pair)) + if ( +#ifdef SOCK_SEQPACKET + socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sock_pair) && +#endif + socketpair(AF_UNIX, SOCK_DGRAM, 0, sock_pair)) LOG_FATAL(LOGF_PrivOps, "socketpair() failed : %s", strerror(errno)); UTI_FdSetCloexec(sock_pair[0]);