diff options
| author | Chris Rees <crees@FreeBSD.org> | 2012-09-25 19:30:36 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2012-09-25 19:30:36 +0000 |
| commit | fd2c7f38fad9cb53df117faf54613b056785087e (patch) | |
| tree | 6b7fc62318e7f7b56309106c9ed151804e2ab513 /sysutils/mcelog/files/patch-server.c | |
| parent | Use more default OPTIONng descriptions (except for VORBIS which turned (diff) | |
Update to 1.0pre3
PR: ports/171866
Submitted by: koitsu
Notes
Notes:
svn path=/head/; revision=304858
Diffstat (limited to 'sysutils/mcelog/files/patch-server.c')
| -rw-r--r-- | sysutils/mcelog/files/patch-server.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sysutils/mcelog/files/patch-server.c b/sysutils/mcelog/files/patch-server.c index 372265eb3282..4b2107c2aa72 100644 --- a/sysutils/mcelog/files/patch-server.c +++ b/sysutils/mcelog/files/patch-server.c @@ -1,5 +1,5 @@ ---- ./server.c.orig 2009-12-15 07:18:40.000000000 -0500 -+++ ./server.c 2011-10-14 22:36:47.000000000 -0400 +--- server.c.orig 2010-01-20 18:36:52.000000000 -0800 ++++ server.c 2012-09-22 02:39:04.991117023 -0700 @@ -101,7 +101,9 @@ static void dispatch_pages(FILE *fh) @@ -77,3 +77,16 @@ cc = xalloc(sizeof(struct clientcon)); if (register_pollcb(nfd, POLLIN, client_event, cc) < 0) { +@@ -300,7 +336,12 @@ + sigaction(SIGALRM, &sa, &oldsa); + if (sigsetjmp(ping_timeout_ctx, 1) == 0) { + alarm(initial_ping_timeout); ++#ifdef __Linux__ + if (connect(fd, un, sizeof(struct sockaddr_un)) < 0) ++#endif ++#ifdef __FreeBSD__ ++ if (connect(fd, (struct sockaddr *) un, sizeof(struct sockaddr_un)) < 0) ++#endif + goto cleanup; + if (write(fd, PAIR("ping\n")) < 0) + goto cleanup;
\ No newline at end of file |