Merge remote-tracking branch 'github/pr/2006'

diff --combined src/daemon/common.c
index 7c64796,208e16d..02df096
--- 1/src/daemon/common.c
--- 2/src/daemon/common.c
+++ b/src/daemon/common.c
@@@ -1620,10 -1620,8 +1620,8 @@@ void set_sock_opts (int sockfd) /* {{{ 
        int status;
        int socktype;
  
-       socklen_t socklen = sizeof (socklen_t);
-       int so_keepalive = 1;
- 
-       status = getsockopt (sockfd, SOL_SOCKET, SO_TYPE, &socktype, &socklen);
+       status = getsockopt (sockfd, SOL_SOCKET, SO_TYPE,
+                       &socktype, &(socklen_t) { sizeof (socktype) });
        if (status != 0)
        {
                WARNING ("set_sock_opts: failed to determine socket type");
@@@ -1633,7 -1631,7 +1631,7 @@@
        if (socktype == SOCK_STREAM)
        {
                status = setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE,
-                               &so_keepalive, sizeof (so_keepalive));
+                               &(int) {1}, sizeof (int));
                if (status != 0)
                        WARNING ("set_sock_opts: failed to set socket keepalive flag");
  
@@@ -1743,7 -1741,7 +1741,7 @@@ int check_capability (int capability) /
        }
  
        cap_header->pid = getpid();
 -      cap_header->version = _LINUX_CAPABILITY_VERSION;
 +      cap_header->version = _LINUX_CAPABILITY_VERSION_3;
        if (capget(cap_header, cap_data) < 0)
        {
                ERROR("check_capability: capget failed");