]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: fix ListenPort= in [WireGuard] section 12382/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 24 Apr 2019 22:39:04 +0000 (00:39 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 25 Apr 2019 00:43:03 +0000 (02:43 +0200)
This fixes a bug introduced by f1368a333e5e08575f0b45dfe41e936b106a8627.

Fixes #12377.

src/network/netdev/wireguard.c

index f3084c0773f17b9f32d789a96a12479e40ba9759..5ebc5dfed84bffe52e496d6c1380d06cf6919b15 100644 (file)
@@ -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;
 }