picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-10-30 08:56:18 +01:00
parent a346aa7c38
commit 864edb39cf
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.network.xml
View File

@ -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

2
src/network/networkd-dhcp4.c
View File

@ -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,

2
src/network/networkd-dhcp4.h
View File

@ -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);

4
src/network/networkd-network-gperf.gperf
View File

@ -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)

2
test/fuzz/fuzz-network-parser/directives.network
View File

@ -97,7 +97,7 @@ RequestOptions=
SendRelease=
MaxAttempts=
IPServiceType=
SendOptions=
SendOption=
[DHCPv6]
UseNTP=
UseDNS=