From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 18 Nov 2019 21:21:37 +0000 (+0100)
Subject: Merge pull request #14064 from yuwata/network-unify-send-option-and-send-raw-option
X-Git-Tag: v244-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b014a6161a414ac84780841867fdd57d8fed71ec;p=thirdparty%2Fsystemd.git

Merge pull request #14064 from yuwata/network-unify-send-option-and-send-raw-option

network: unify SendOption= and SendRawOption=
---

b014a6161a414ac84780841867fdd57d8fed71ec
diff --cc src/network/networkd-dhcp-server.c
index 279f7789cb9,98bb647bd7a..fc1cd5ca1b4
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@@ -302,11 -301,11 +301,11 @@@ int dhcp4_server_configure(Link *link) 
  
                  r = sd_dhcp_server_set_timezone(link->dhcp_server, tz);
                  if (r < 0)
 -                        return r;
 +                        return log_link_error_errno(link, r, "Failed to set timezone for DHCP server: %m");
          }
  
-         ORDERED_HASHMAP_FOREACH(p, link->network->dhcp_server_raw_options, i) {
-                 r = sd_dhcp_server_add_raw_option(link->dhcp_server, p);
+         ORDERED_HASHMAP_FOREACH(p, link->network->dhcp_server_send_options, i) {
+                 r = sd_dhcp_server_add_option(link->dhcp_server, p);
                  if (r == -EEXIST)
                          continue;
                  if (r < 0)