network: rename SendOptions= to SendOption=

The name with plural made more sense where multiple options could be specified
in one line. After changes in the pull request, this option only accepts one
value, so from users' POV it should be singular.

(The field in the data structure remains plural, because it actually stores
multiple values.)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 6f08edb369689425efe8e000db239dd2403d7ed6..3ef6ff592cd7b44cf2fd860e6e205c96f7c312d1 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1640,7 +1640,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><varname>SendOptions=</varname></term>
+          <term><varname>SendOption=</varname></term>
           <listitem>
             <para>Send a raw option with value via DHCPv4 client. Takes a DHCP option and base64 encoded
             data separated with a colon (option:value). The option ranges [1-254]. This option can be

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 70ab9b2a543387a8cccab4de7aac9601e0147b63..45091de97d112c4f6b9337648886d40a93b5c590 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1566,7 +1566,7 @@ int config_parse_dhcp_request_options(
         return 0;
 }
 
-int config_parse_dhcp_send_options(
+int config_parse_dhcp_send_option(
                 const char *unit,
                 const char *filename,
                 unsigned line,

diff --git a/src/network/networkd-dhcp4.h b/src/network/networkd-dhcp4.h
index dbaec18781ca2ee2ba5e4f30bd3f64d4b3f709c3..2c0ccd80dfb7338992411cab9c3140a5cf2a84ed 100644 (file)
--- a/src/network/networkd-dhcp4.h
+++ b/src/network/networkd-dhcp4.h
@@ -27,4 +27,4 @@ CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_black_listed_ip_address);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_max_attempts);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_user_class);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_request_options);
-CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_send_options);
+CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_send_option);

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 1375626e8655a38f81df7fb57ee4925eca4734c9..870a4c8886b311eca2aa69bd7649ce8717361ffb 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -175,12 +175,12 @@ DHCPv4.ListenPort,                      config_parse_uint16,
 DHCPv4.SendRelease,                     config_parse_bool,                               0,                             offsetof(Network, dhcp_send_release)
 DHCPv4.BlackList,                       config_parse_dhcp_black_listed_ip_address,       0,                             0
 DHCPv4.IPServiceType,                   config_parse_ip_service_type,                    0,                             offsetof(Network, ip_service_type)
-DHCPv4.SendOptions,                     config_parse_dhcp_send_options,                  0,                             0
+DHCPv4.SendOption,                      config_parse_dhcp_send_option,                  0,                             0
 DHCPv6.UseDNS,                          config_parse_bool,                               0,                             offsetof(Network, dhcp6_use_dns)
 DHCPv6.UseNTP,                          config_parse_bool,                               0,                             offsetof(Network, dhcp6_use_ntp)
 DHCPv6.RapidCommit,                     config_parse_bool,                               0,                             offsetof(Network, rapid_commit)
 DHCPv6.ForceDHCPv6PDOtherInformation,   config_parse_bool,                               0,                             offsetof(Network, dhcp6_force_pd_other_information)
-DHCPv6.PrefixDelegationHint,            config_parse_dhcp6_pd_hint,                    0,                             0
+DHCPv6.PrefixDelegationHint,            config_parse_dhcp6_pd_hint,                      0,                             0
 IPv6AcceptRA.UseAutonomousPrefix,       config_parse_bool,                               0,                             offsetof(Network, ipv6_accept_ra_use_autonomous_prefix)
 IPv6AcceptRA.UseOnLinkPrefix,           config_parse_bool,                               0,                             offsetof(Network, ipv6_accept_ra_use_onlink_prefix)
 IPv6AcceptRA.UseDNS,                    config_parse_bool,                               0,                             offsetof(Network, ipv6_accept_ra_use_dns)

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index 0d0892fd3afa7179c8f6eb4815a2d362b6d86374..f01a20118bd5955af26fe2e551904bb911c9eb55 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -97,7 +97,7 @@ RequestOptions=
 SendRelease=
 MaxAttempts=
 IPServiceType=
-SendOptions=
+SendOption=
 [DHCPv6]
 UseNTP=
 UseDNS=