d24108b9c9
- Add several upstream bugfix patches which are missed: * 0018-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch * 0026-udevadm.xml-document-resolve-names-option-for-test.patch * 0030-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch * 0032-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch * 0031-man-document-the-b-special-boot-option.patch * 0033-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch * 0034-systemd-python-fix-booted-and-add-two-functions-to-d.patch * 0035-activate-mention-E-in-the-help-text.patch * 0036-activate-fix-crash-when-s-is-passed.patch * 0037-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch * 0038-core-socket-fix-SO_REUSEPORT.patch * 0039-journal-when-appending-to-journal-file-allocate-larg.patch * 0040-journal-optimize-bisection-logic-a-bit-by-caching-th.patch * 0041-journal-fix-iteration-when-we-go-backwards-from-the-.patch * 0042-journal-allow-journal_file_copy_entry-to-work-on-non.patch * 0043-journal-simplify-pre-allocation-logic.patch * 0044-journald-mention-how-long-we-needed-to-flush-to-var-.patch * 0046-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch * 0047-docs-remove-unneeded-the-s-in-gudev-docs.patch * 0048-man-explicitly-say-when-multiple-units-can-be-specif.patch * 0049-systemd-treat-reload-failure-as-failure.patch - Add patch 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch to avoid potential NULL pointer - Reorder patches to reflect udev/systemd usage - don't build bash-completions for bootstrap package - add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/request/show/222383 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=176
39 lines
2.0 KiB
Diff
39 lines
2.0 KiB
Diff
From f0511bd7e3d591383485a36ddcb764abe74b1939 Mon Sep 17 00:00:00 2001
|
|
From: Shawn Landden <shawn@churchofgit.com>
|
|
Date: Sat, 16 Nov 2013 13:18:13 -0800
|
|
Subject: [PATCH] core/socket: fix SO_REUSEPORT
|
|
|
|
---
|
|
src/core/load-fragment-gperf.gperf.m4 | 1 +
|
|
src/core/socket.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/core/load-fragment-gperf.gperf.m4 src/core/load-fragment-gperf.gperf.m4
|
|
index e3025d2..b64fdc9 100644
|
|
--- src/core/load-fragment-gperf.gperf.m4
|
|
+++ src/core/load-fragment-gperf.gperf.m4
|
|
@@ -210,6 +210,7 @@ Socket.Broadcast, config_parse_bool, 0,
|
|
Socket.PassCredentials, config_parse_bool, 0, offsetof(Socket, pass_cred)
|
|
Socket.PassSecurity, config_parse_bool, 0, offsetof(Socket, pass_sec)
|
|
Socket.TCPCongestion, config_parse_string, 0, offsetof(Socket, tcp_congestion)
|
|
+Socket.ReusePort, config_parse_bool, 0, offsetof(Socket, reuseport)
|
|
Socket.MessageQueueMaxMessages, config_parse_long, 0, offsetof(Socket, mq_maxmsg)
|
|
Socket.MessageQueueMessageSize, config_parse_long, 0, offsetof(Socket, mq_msgsize)
|
|
Socket.Service, config_parse_socket_service, 0, 0
|
|
diff --git src/core/socket.c src/core/socket.c
|
|
index f505e4f..751f20b 100644
|
|
--- src/core/socket.c
|
|
+++ src/core/socket.c
|
|
@@ -771,7 +771,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
|
|
|
|
if (s->reuseport) {
|
|
int b = s->reuseport;
|
|
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &b, sizeof(b)))
|
|
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &b, sizeof(b)) < 0)
|
|
log_warning_unit(UNIT(s)->id, "SO_REUSEPORT failed: %m");
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|