Blame SOURCES/mcelog-patch-1bd2984.patch
|
 |
2ebc90 |
From: Prarit Bhargava <prarit@redhat.com>
|
|
|
2ebc90 |
|
|
|
2ebc90 |
fix: server does not start because it assumed it is already running
|
|
|
2ebc90 |
|
|
|
2ebc90 |
commit 1bd29846db20a76ec7492dd54716a11976a5d9fb
|
|
|
2ebc90 |
Author: Balázs Póka <poka@idata.hu>
|
|
|
2ebc90 |
Date: Sat Aug 22 14:06:14 2015 +0200
|
|
|
2ebc90 |
|
|
|
2ebc90 |
fix: server does not start because it assumed it is already running
|
|
|
2ebc90 |
|
|
|
2ebc90 |
diff --git a/server.c b/server.c
|
|
|
2ebc90 |
index a1fa7da16ba79663bdf2f4542d0b82fdd2a786b9..eddf147a527e721419b752ea56577ee36c85056a 100644
|
|
|
2ebc90 |
--- a/server.c
|
|
|
2ebc90 |
+++ b/server.c
|
|
|
2ebc90 |
@@ -297,9 +297,9 @@ static int server_ping(struct sockaddr_un *un)
|
|
|
2ebc90 |
if (fd < 0)
|
|
|
2ebc90 |
return 0;
|
|
|
2ebc90 |
|
|
|
2ebc90 |
- sigaction(SIGALRM, &sa, &oldsa);
|
|
|
2ebc90 |
+ sigaction(SIGALRM, &sa, &oldsa);
|
|
|
2ebc90 |
if (sigsetjmp(ping_timeout_ctx, 1) == 0) {
|
|
|
2ebc90 |
- ret = 0;
|
|
|
2ebc90 |
+ ret = -1;
|
|
|
2ebc90 |
alarm(initial_ping_timeout);
|
|
|
2ebc90 |
if (connect(fd, un, sizeof(struct sockaddr_un)) < 0)
|
|
|
2ebc90 |
goto cleanup;
|
|
|
2ebc90 |
@@ -315,7 +315,7 @@ cleanup:
|
|
|
2ebc90 |
sigaction(SIGALRM, &oldsa, NULL);
|
|
|
2ebc90 |
alarm(0);
|
|
|
2ebc90 |
close(fd);
|
|
|
2ebc90 |
- return ret;
|
|
|
2ebc90 |
+ return ret;
|
|
|
2ebc90 |
}
|
|
|
2ebc90 |
|
|
|
2ebc90 |
void server_setup(void)
|