system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: fix typos, wrong log domain in DHCPv4

Browse source
This commit is contained in:
Stefan Brüns 2012-11-10 18:51:43 +01:00 committed by Dan Williams
parent 35689c7bd0
commit 357f312cea
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnm-util/nm-setting-ip4-config.c
View file

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

2
src/nm-device.c
View file

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