Blame 0001-remote-fix-registration-of-TLS-socket.patch
|
Daniel P. Berrangé |
749dc3 |
From 522b3d2b24d0f7ac78dad442c990d4e34db0eaf2 Mon Sep 17 00:00:00 2001
|
|
Daniel P. Berrangé |
749dc3 |
From: Michael Chapman <mike@very.puzzling.org>
|
|
Daniel P. Berrangé |
749dc3 |
Date: Tue, 17 Sep 2019 17:03:57 +1000
|
|
Daniel P. Berrangé |
749dc3 |
Subject: [PATCH] remote: fix registration of TLS socket
|
|
Daniel P. Berrangé |
749dc3 |
MIME-Version: 1.0
|
|
Daniel P. Berrangé |
749dc3 |
Content-Type: text/plain; charset=UTF-8
|
|
Daniel P. Berrangé |
749dc3 |
Content-Transfer-Encoding: 8bit
|
|
Daniel P. Berrangé |
749dc3 |
|
|
Daniel P. Berrangé |
749dc3 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Daniel P. Berrangé |
749dc3 |
Signed-off-by: Michael Chapman <mike@very.puzzling.org>
|
|
Daniel P. Berrangé |
749dc3 |
---
|
|
Daniel P. Berrangé |
749dc3 |
src/remote/remote_daemon.c | 2 +-
|
|
Daniel P. Berrangé |
749dc3 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Daniel P. Berrangé |
749dc3 |
|
|
Daniel P. Berrangé |
749dc3 |
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
|
|
Daniel P. Berrangé |
749dc3 |
index 966f3da2d0..7195ac9218 100644
|
|
Daniel P. Berrangé |
749dc3 |
--- a/src/remote/remote_daemon.c
|
|
Daniel P. Berrangé |
749dc3 |
+++ b/src/remote/remote_daemon.c
|
|
Daniel P. Berrangé |
749dc3 |
@@ -505,7 +505,7 @@ daemonSetupNetworking(virNetServerPtr srv,
|
|
Daniel P. Berrangé |
749dc3 |
config->max_client_requests) < 0)
|
|
Daniel P. Berrangé |
749dc3 |
goto cleanup;
|
|
Daniel P. Berrangé |
749dc3 |
|
|
Daniel P. Berrangé |
749dc3 |
- if (((ipsock && config->listen_tls) || (act && virSystemdActivationHasName(act, "ip-tls")))) {
|
|
Daniel P. Berrangé |
749dc3 |
+ if (((ipsock && config->listen_tls) || (act && virSystemdActivationHasName(act, DAEMON_NAME "-tls.socket")))) {
|
|
Daniel P. Berrangé |
749dc3 |
virNetTLSContextPtr ctxt = NULL;
|
|
Daniel P. Berrangé |
749dc3 |
|
|
Daniel P. Berrangé |
749dc3 |
if (config->ca_file ||
|
|
Daniel P. Berrangé |
749dc3 |
--
|
|
Daniel P. Berrangé |
749dc3 |
2.21.0
|
|
Daniel P. Berrangé |
749dc3 |
|