From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 10 Dec 2013 14:49:06 +0000 (+0100)
Subject: Revert "virtlockd: treat SIGHUP like SIGUSR1"
X-Git-Tag: CVE-2013-6436~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d10a6506b04e9bf3169f846bbb984f3c0fdca198;p=thirdparty%2Flibvirt.git

Revert "virtlockd: treat SIGHUP like SIGUSR1"

This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5.

After some discussion upstream [1] this patch turns out to be spurious.
It better gets reverted prior to a release.

1: https://www.redhat.com/archives/libvir-list/2013-December/msg00563.html

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index ae09ef8c66..a6be43c3ce 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -592,8 +592,6 @@ virLockDaemonSetupSignals(virNetServerPtr srv)
         return -1;
     if (virNetServerAddSignalHandler(srv, SIGUSR1, virLockDaemonExecRestartHandler, NULL) < 0)
         return -1;
-    if (virNetServerAddSignalHandler(srv, SIGHUP, virLockDaemonExecRestartHandler, NULL) < 0)
-        return -1;
     return 0;
 }
 
diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in
index 022d67ffac..99612aa537 100644
--- a/src/locking/virtlockd.pod.in
+++ b/src/locking/virtlockd.pod.in
@@ -54,9 +54,9 @@ Display version information then exit.
 
 =head1 SIGNALS
 
-On receipt of B<SIGUSR1> or B<SIGHUP> virtlockd will re-exec() its
-binary, while maintaining all current locks and clients. This allows
-for live upgrades of the virtlockd service.
+On receipt of B<SIGUSR1> virtlockd will re-exec() its binary, while
+maintaining all current locks and clients. This allows for live
+upgrades of the virtlockd service.
 
 =head1 FILES