From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- .../systemd/files/242-wireguard-listenport.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 sys-apps/systemd/files/242-wireguard-listenport.patch (limited to 'sys-apps/systemd/files') diff --git a/sys-apps/systemd/files/242-wireguard-listenport.patch b/sys-apps/systemd/files/242-wireguard-listenport.patch new file mode 100644 index 000000000000..39b3c7c0a54c --- /dev/null +++ b/sys-apps/systemd/files/242-wireguard-listenport.patch @@ -0,0 +1,49 @@ +From a62b7bb79e9a2aa683624c32cde1c756d8466fb4 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Thu, 25 Apr 2019 00:39:04 +0200 +Subject: [PATCH] network: fix ListenPort= in [WireGuard] section + +This fixes a bug introduced by f1368a333e5e08575f0b45dfe41e936b106a8627. + +Fixes #12377. +--- + src/network/netdev/wireguard.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c +index f3084c0773f..5ebc5dfed84 100644 +--- a/src/network/netdev/wireguard.c ++++ b/src/network/netdev/wireguard.c +@@ -452,22 +452,23 @@ int config_parse_wireguard_listen_port( + void *userdata) { + + uint16_t *s = data; +- uint16_t port = 0; + int r; + + assert(rvalue); + assert(data); + +- if (!streq(rvalue, "auto")) { +- r = parse_ip_port(rvalue, s); +- if (r < 0) { +- log_syntax(unit, LOG_ERR, filename, line, r, +- "Invalid port specification, ignoring assignment: %s", rvalue); +- return 0; +- } ++ if (isempty(rvalue) || streq(rvalue, "auto")) { ++ *s = 0; ++ return 0; ++ } ++ ++ r = parse_ip_port(rvalue, s); ++ if (r < 0) { ++ log_syntax(unit, LOG_ERR, filename, line, r, ++ "Invalid port specification, ignoring assignment: %s", rvalue); ++ return 0; + } + +- *s = port; + return 0; + } + -- cgit v1.2.3