mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
trivial: fix typos, wrong log domain in DHCPv4
This commit is contained in:
parent
35689c7bd0
commit
357f312cea
|
@ -1001,7 +1001,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
|
|||
* List of DNS servers (network byte order). For the 'auto' method, these
|
||||
* DNS servers are appended to those (if any) returned by automatic
|
||||
* configuration. DNS servers cannot be used with the 'shared', 'link-local',
|
||||
* or 'disabled' methods as there is no usptream network. In all other
|
||||
* or 'disabled' methods as there is no upstream network. In all other
|
||||
* methods, these DNS servers are used as the only DNS servers for this
|
||||
* connection.
|
||||
**/
|
||||
|
@ -1014,7 +1014,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
|
|||
"appended to those (if any) returned by automatic "
|
||||
"configuration. DNS servers cannot be used with "
|
||||
"the 'shared', 'link-local', or 'disabled' "
|
||||
"methods as there is no usptream network. In all "
|
||||
"methods as there is no upstream network. In all "
|
||||
"other methods, these DNS servers are used as the "
|
||||
"only DNS servers for this connection.",
|
||||
DBUS_TYPE_G_UINT_ARRAY,
|
||||
|
@ -1148,7 +1148,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
|
|||
* NMSettingIP4Config:dhcp-client-id:
|
||||
*
|
||||
* A string sent to the DHCP server to identify the local machine which the
|
||||
* DHCP server may use to cusomize the DHCP lease and options.
|
||||
* DHCP server may use to customize the DHCP lease and options.
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_DHCP_CLIENT_ID,
|
||||
|
@ -1156,7 +1156,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
|
|||
"DHCP Client ID",
|
||||
"A string sent to the DHCP server to identify the "
|
||||
"local machine which the DHCP server may use to "
|
||||
"cusomize the DHCP lease and options.",
|
||||
"customize the DHCP lease and options.",
|
||||
NULL,
|
||||
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
|
||||
|
||||
|
|
|
@ -1589,7 +1589,7 @@ dhcp4_lease_change (NMDevice *device, NMIP4Config *config)
|
|||
nm_utils_merge_ip4_config (config, nm_connection_get_setting_ip4_config (connection));
|
||||
|
||||
if (!nm_device_set_ip4_config (device, config, FALSE, &reason)) {
|
||||
nm_log_warn (LOGD_DHCP6, "(%s): failed to update IPv4 config in response to DHCP event.",
|
||||
nm_log_warn (LOGD_DHCP4, "(%s): failed to update IPv4 config in response to DHCP event.",
|
||||
nm_device_get_ip_iface (device));
|
||||
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason);
|
||||
return;
|
||||
|
|
Loading…
Reference in a new issue