]> xenbits.xensource.com Git - libvirt.git/commitdiff
daemon: virtlockd: Call virNetDaemonGetServer regardless of post exec
authorErik Skultety <eskultet@redhat.com>
Tue, 14 Nov 2017 13:35:51 +0000 (14:35 +0100)
committerErik Skultety <eskultet@redhat.com>
Wed, 15 Nov 2017 14:11:55 +0000 (15:11 +0100)
We need to call it anyway, so the else branch is redundant here.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
src/locking/lock_daemon.c

index 0d5e999ef4a9c66f5c3a1e0454f46ae95dd13703..6751b57bc5c9567d09eebe57947399cd4164877b 100644 (file)
@@ -1325,10 +1325,11 @@ int main(int argc, char **argv) {
             ret = VIR_LOCK_DAEMON_ERR_NETWORK;
             goto cleanup;
         }
-    } else if (rv == 1) {
-        srv = virNetDaemonGetServer(lockDaemon->dmn, "virtlockd");
+        virObjectUnref(srv);
     }
 
+    srv = virNetDaemonGetServer(lockDaemon->dmn, "virtlockd");
+
     if (timeout != -1) {
         VIR_DEBUG("Registering shutdown timeout %d", timeout);
         virNetDaemonAutoShutdown(lockDaemon->dmn,