rpc: avoid unlinking sockets passed in from systemd

Currently the socket code will unlink any UNIX socket path which is
associated with a server socket. This is not fine grained enough, as we
need to avoid unlinking server sockets we were passed by systemd.

To deal with this we must explicitly track whether each socket needs to
be unlinked when closed, separately of the client vs server state.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index c10b2d383c6ffb8c8509c91fc6cb77d60bbc1c61..0f90606be6e0467409d6c65eb18ed9cb6d572ce4 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -619,6 +619,7 @@ virLockDaemonSetupNetworkingSystemD(virNetServerPtr lockSrv, virNetServerPtr adm
          * so the first FD we'll get is '3'. */
         if (!(svc = virNetServerServiceNewFDs(fds,
                                               ARRAY_CARDINALITY(fds),
+                                              false,
                                               0,
                                               NULL,
                                               false, 0, 1)))

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 65319993813df81274272598bd373ca5ea2fcf08..30c70a20dd1636fd33f070e20d996078c3095989 100644 (file)
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -554,6 +554,7 @@ virLogDaemonSetupNetworkingSystemD(virNetServerPtr logSrv, virNetServerPtr admin
          * so the first FD we'll get is '3'. */
         if (!(svc = virNetServerServiceNewFDs(fds,
                                               ARRAY_CARDINALITY(fds),
+                                              false,
                                               0,
                                               NULL,
                                               false, 0, 1)))

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 0d2f264696f169115da3026563cdaa9915725703..315a4950dfd89319b6d9a7dd1560d6a9fd71dd99 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -121,6 +121,7 @@ virNetServerServiceNewFDOrUNIX(const char *path,
          */
         return virNetServerServiceNewFDs(fds,
                                          ARRAY_CARDINALITY(fds),
+                                         false,
                                          auth,
                                          tls,
                                          readonly,
@@ -257,6 +258,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path,
 
 virNetServerServicePtr virNetServerServiceNewFDs(int *fds,
                                                  size_t nfds,
+                                                 bool unlinkUNIX,
                                                  int auth,
                                                  virNetTLSContextPtr tls,
                                                  bool readonly,
@@ -272,6 +274,7 @@ virNetServerServicePtr virNetServerServiceNewFDs(int *fds,
 
     for (i = 0; i < nfds; i++) {
         if (virNetSocketNewListenFD(fds[i],
+                                    unlinkUNIX,
                                     &socks[i]) < 0)
             goto cleanup;
     }

diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index 59ee51e5eebc2f2ab2e9265ea70e21b905d95dc7..73d61dde99f4db71666b2b802a7e7d348d7310b4 100644 (file)
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -62,6 +62,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path,
                                                   size_t nrequests_client_max);
 virNetServerServicePtr virNetServerServiceNewFDs(int *fd,
                                                  size_t nfds,
+                                                 bool unlinkUNIX,
                                                  int auth,
                                                  virNetTLSContextPtr tls,
                                                  bool readonly,

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 2346eb8b0fdfc75c47e0bbca36dcbbf23f8abc5c..34a9947eb307a6c1d6fa647949c192ea8f1ca365 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -78,9 +78,10 @@ struct _virNetSocket {
     int watch;
     pid_t pid;
     int errfd;
-    bool client;
+    bool isClient;
     bool ownsFd;
     bool quietEOF;
+    bool unlinkUNIX;
 
     /* Event callback fields */
     virNetSocketIOFunc func;
@@ -216,10 +217,14 @@ int virNetSocketCheckProtocols(bool *hasIPv4,
 }
 
 
-static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
-                                       virSocketAddrPtr remoteAddr,
-                                       bool isClient,
-                                       int fd, int errfd, pid_t pid)
+static virNetSocketPtr
+virNetSocketNew(virSocketAddrPtr localAddr,
+                virSocketAddrPtr remoteAddr,
+                bool isClient,
+                int fd,
+                int errfd,
+                pid_t pid,
+                bool unlinkUNIX)
 {
     virNetSocketPtr sock;
     int no_slow_start = 1;
@@ -254,6 +259,8 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
     sock->pid = pid;
     sock->watch = -1;
     sock->ownsFd = true;
+    sock->isClient = isClient;
+    sock->unlinkUNIX = unlinkUNIX;
 
     /* Disable nagle for TCP sockets */
     if (sock->localAddr.data.sa.sa_family == AF_INET ||
@@ -280,8 +287,6 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
         !(sock->remoteAddrStrURI = virSocketAddrFormatFull(remoteAddr, true, NULL)))
         goto error;
 
-    sock->client = isClient;
-
     PROBE(RPC_SOCKET_NEW,
           "sock=%p fd=%d errfd=%d pid=%lld localAddr=%s, remoteAddr=%s",
           sock, fd, errfd, (long long)pid,
@@ -427,7 +432,7 @@ int virNetSocketNewListenTCP(const char *nodename,
         if (VIR_EXPAND_N(socks, nsocks, 1) < 0)
             goto error;
 
-        if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, 0)))
+        if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, 0, false)))
             goto error;
         runp = runp->ai_next;
         fd = -1;
@@ -513,7 +518,7 @@ int virNetSocketNewListenUNIX(const char *path,
         goto error;
     }
 
-    if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0)))
+    if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0, true)))
         goto error;
 
     return 0;
@@ -538,6 +543,7 @@ int virNetSocketNewListenUNIX(const char *path ATTRIBUTE_UNUSED,
 #endif
 
 int virNetSocketNewListenFD(int fd,
+                            bool unlinkUNIX,
                             virNetSocketPtr *retsock)
 {
     virSocketAddr addr;
@@ -551,7 +557,7 @@ int virNetSocketNewListenFD(int fd,
         return -1;
     }
 
-    if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0)))
+    if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0, unlinkUNIX)))
         return -1;
 
     return 0;
@@ -627,7 +633,7 @@ int virNetSocketNewConnectTCP(const char *nodename,
         goto error;
     }
 
-    if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0)))
+    if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0, false)))
         goto error;
 
     freeaddrinfo(ai);
@@ -752,7 +758,7 @@ int virNetSocketNewConnectUNIX(const char *path,
         goto cleanup;
     }
 
-    if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0)))
+    if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0, false)))
         goto cleanup;
 
     ret = 0;
@@ -820,7 +826,7 @@ int virNetSocketNewConnectCommand(virCommandPtr cmd,
     VIR_FORCE_CLOSE(sv[1]);
     VIR_FORCE_CLOSE(errfd[1]);
 
-    if (!(*retsock = virNetSocketNew(NULL, NULL, true, sv[0], errfd[0], pid)))
+    if (!(*retsock = virNetSocketNew(NULL, NULL, true, sv[0], errfd[0], pid, false)))
         goto error;
 
     virCommandFree(cmd);
@@ -1219,7 +1225,7 @@ int virNetSocketNewConnectSockFD(int sockfd,
         return -1;
     }
 
-    if (!(*retsock = virNetSocketNew(&localAddr, NULL, true, sockfd, -1, -1)))
+    if (!(*retsock = virNetSocketNew(&localAddr, NULL, true, sockfd, -1, -1, false)))
         return -1;
 
     return 0;
@@ -1232,6 +1238,7 @@ virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object)
     virSocketAddr remoteAddr;
     int fd, thepid, errfd;
     bool isClient;
+    bool unlinkUNIX;
 
     if (virJSONValueObjectGetNumberInt(object, "fd", &fd) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -1250,12 +1257,16 @@ virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object)
                        _("Missing errfd data in JSON document"));
         return NULL;
     }
+
     if (virJSONValueObjectGetBoolean(object, "isClient", &isClient) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Missing isClient data in JSON document"));
         return NULL;
     }
 
+    if (virJSONValueObjectGetBoolean(object, "unlinkUNIX", &unlinkUNIX) < 0)
+        unlinkUNIX = !isClient;
+
     memset(&localAddr, 0, sizeof(localAddr));
     memset(&remoteAddr, 0, sizeof(remoteAddr));
 
@@ -1271,8 +1282,8 @@ virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object)
         return NULL;
     }
 
-    return virNetSocketNew(&localAddr, &remoteAddr,
-                           isClient, fd, errfd, thepid);
+    return virNetSocketNew(&localAddr, &remoteAddr, isClient,
+                           fd, errfd, thepid, unlinkUNIX);
 }
 
 
@@ -1309,7 +1320,10 @@ virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock)
     if (virJSONValueObjectAppendNumberInt(object, "pid", sock->pid) < 0)
         goto error;
 
-    if (virJSONValueObjectAppendBoolean(object, "isClient", sock->client) < 0)
+    if (virJSONValueObjectAppendBoolean(object, "isClient", sock->isClient) < 0)
+        goto error;
+
+    if (virJSONValueObjectAppendBoolean(object, "unlinkUNIX", sock->unlinkUNIX) < 0)
         goto error;
 
     if (virSetInherit(sock->fd, true) < 0) {
@@ -1350,7 +1364,7 @@ void virNetSocketDispose(void *obj)
 
 #ifdef HAVE_SYS_UN_H
     /* If a server socket, then unlink UNIX path */
-    if (!sock->client &&
+    if (sock->unlinkUNIX &&
         sock->localAddr.data.sa.sa_family == AF_UNIX &&
         sock->localAddr.data.un.sun_path[0] != '\0')
         unlink(sock->localAddr.data.un.sun_path);
@@ -2141,7 +2155,8 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock)
     if (!(*clientsock = virNetSocketNew(&localAddr,
                                         &remoteAddr,
                                         true,
-                                        fd, -1, 0)))
+                                        fd, -1, 0,
+                                        false)))
         goto cleanup;
 
     fd = -1;
@@ -2272,7 +2287,7 @@ void virNetSocketClose(virNetSocketPtr sock)
 
 #ifdef HAVE_SYS_UN_H
     /* If a server socket, then unlink UNIX path */
-    if (!sock->client &&
+    if (sock->unlinkUNIX &&
         sock->localAddr.data.sa.sa_family == AF_UNIX &&
         sock->localAddr.data.un.sun_path[0] != '\0') {
         if (unlink(sock->localAddr.data.un.sun_path) == 0)

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index de5a465cdecaa30aae7e7558fd426d7fcf33351f..2f626cb08f36509f6471b54621f8562785ed2ac8 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -58,6 +58,7 @@ int virNetSocketNewListenUNIX(const char *path,
                               virNetSocketPtr *addr);
 
 int virNetSocketNewListenFD(int fd,
+                            bool unlinkUNIX,
                             virNetSocketPtr *addr);
 
 int virNetSocketNewConnectTCP(const char *nodename,

diff --git a/tests/virnetdaemondata/input-data-anon-clients.json b/tests/virnetdaemondata/input-data-anon-clients.json
index 8058fe0a43d1bd0299160b00479ab36ed200fa67..3ca2af3899518bfd27f5b68bed3439b2a839ed33 100644 (file)
--- a/tests/virnetdaemondata/input-data-anon-clients.json
+++ b/tests/virnetdaemondata/input-data-anon-clients.json
@@ -17,7 +17,8 @@
                     "fd": 100,
                     "errfd": -1,
                     "pid": 0,
-                    "isClient": false
+                    "isClient": false,
+                    "unlinkUNIX": true
                 }
             ]
         },
@@ -30,7 +31,8 @@
                     "fd": 101,
                     "errfd": -1,
                     "pid": 0,
-                    "isClient": false
+                    "isClient": false,
+                    "unlinkUNIX": true
                 }
             ]
         }
@@ -44,7 +46,8 @@
                 "fd": 102,
                 "errfd": -1,
                 "pid": -1,
-                "isClient": true
+                "isClient": true,
+                "unlinkUNIX": false
             },
            "privateData": 1729
         },
@@ -56,7 +59,8 @@
                 "fd": 103,
                 "errfd": -1,
                 "pid": -1,
-                "isClient": true
+                "isClient": true,
+                "unlinkUNIX": false
             },
            "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-admin-server-names.json b/tests/virnetdaemondata/output-data-admin-server-names.json
index 04cb5e6bb397146c341ffb62672d48e7a09234f5..4488a23291654110cacf80fc4aa5561aefbe724a 100644 (file)
--- a/tests/virnetdaemondata/output-data-admin-server-names.json
+++ b/tests/virnetdaemondata/output-data-admin-server-names.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }
@@ -87,7 +91,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -100,7 +105,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -116,7 +122,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -130,7 +137,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-admin.json b/tests/virnetdaemondata/output-data-admin.json
index 04cb5e6bb397146c341ffb62672d48e7a09234f5..4488a23291654110cacf80fc4aa5561aefbe724a 100644 (file)
--- a/tests/virnetdaemondata/output-data-admin.json
+++ b/tests/virnetdaemondata/output-data-admin.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }
@@ -87,7 +91,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -100,7 +105,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -116,7 +122,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -130,7 +137,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-anon-clients.json b/tests/virnetdaemondata/output-data-anon-clients.json
index 49fe89be48308cf8862dc89871d0a0f789d0716d..c7090d2ed87cd9502fecc6be353935ce0b508ea9 100644 (file)
--- a/tests/virnetdaemondata/output-data-anon-clients.json
+++ b/tests/virnetdaemondata/output-data-anon-clients.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-client-auth-pending.json b/tests/virnetdaemondata/output-data-client-auth-pending.json
index 0675404e6c75609830ec621ea9220e8d202fd301..9011588d8de01ad97dee8a1ca1b74862e2abcfdc 100644 (file)
--- a/tests/virnetdaemondata/output-data-client-auth-pending.json
+++ b/tests/virnetdaemondata/output-data-client-auth-pending.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-client-ids.json b/tests/virnetdaemondata/output-data-client-ids.json
index 90c3383a93c0986e2692a116b41ef2f94cd9a30e..5840757614c552f36c2432c496cbdf777bb9d092 100644 (file)
--- a/tests/virnetdaemondata/output-data-client-ids.json
+++ b/tests/virnetdaemondata/output-data-client-ids.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-client-timestamp.json b/tests/virnetdaemondata/output-data-client-timestamp.json
index 9cfb069793542fe42181b5e92e7b2f9f8233ce0c..e685475c4addcc090c055435d25aefcf708db66a 100644 (file)
--- a/tests/virnetdaemondata/output-data-client-timestamp.json
+++ b/tests/virnetdaemondata/output-data-client-timestamp.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -49,7 +51,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -64,7 +67,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-initial.json b/tests/virnetdaemondata/output-data-initial.json
index 916297c59dd33754df01cf3166ce2c06a22cb79d..f887d37379145bf9294b6be97e548f84bb7c0942 100644 (file)
--- a/tests/virnetdaemondata/output-data-initial.json
+++ b/tests/virnetdaemondata/output-data-initial.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }

diff --git a/tests/virnetdaemondata/output-data-no-keepalive-required.json b/tests/virnetdaemondata/output-data-no-keepalive-required.json
index 04cb5e6bb397146c341ffb62672d48e7a09234f5..4488a23291654110cacf80fc4aa5561aefbe724a 100644 (file)
--- a/tests/virnetdaemondata/output-data-no-keepalive-required.json
+++ b/tests/virnetdaemondata/output-data-no-keepalive-required.json
@@ -19,7 +19,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -32,7 +33,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -48,7 +50,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -62,7 +65,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }
@@ -87,7 +91,8 @@
               "fd": 100,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         },
@@ -100,7 +105,8 @@
               "fd": 101,
               "errfd": -1,
               "pid": 0,
-              "isClient": false
+              "isClient": false,
+              "unlinkUNIX": true
             }
           ]
         }
@@ -116,7 +122,8 @@
             "fd": 102,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         },
@@ -130,7 +137,8 @@
             "fd": 103,
             "errfd": -1,
             "pid": -1,
-            "isClient": true
+            "isClient": true,
+            "unlinkUNIX": false
           },
           "privateData": 1729
         }