diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
| commit | f914c41532a9e4f2bb44be074466b62e4cac8db3 (patch) | |
| tree | 046e8e7a186afecf299cd80d62fa1c93903dbecf /src/initrd/nmi-ibft-reader.c | |
| parent | 19e73abd360f0198f94ce49f36ddf009056f6324 (diff) | |
| parent | 1e5977b62f896e844b548c3007ace9e1dfa7f9ed (diff) | |
Update upstream source from tag 'upstream/1.23.90'
Update to upstream version '1.23.90' with Debian dir 38c3873648b51c73a9e448ccb2ac18152c2b3f85
Diffstat (limited to 'src/initrd/nmi-ibft-reader.c')
| -rw-r--r-- | src/initrd/nmi-ibft-reader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index 47b90ebf..477bc0bf 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -200,23 +200,23 @@ ip_setting_add_from_block (GHashTable *nic, g_return_val_if_reached (FALSE); } g_object_set (s_ip, - NM_SETTING_IP_CONFIG_METHOD, method, - NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, + NM_SETTING_IP_CONFIG_METHOD, method, + NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, NULL); - if (s_gateway && !nm_utils_ipaddr_valid (family, s_gateway)) { + if (s_gateway && !nm_utils_ipaddr_is_valid (family, s_gateway)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid IP gateway '%s'.", s_gateway); return FALSE; } - if (s_dns1 && !nm_utils_ipaddr_valid (family, s_dns1)) { + if (s_dns1 && !nm_utils_ipaddr_is_valid (family, s_dns1)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid DNS1 address '%s'.", s_dns1); return FALSE; } - if (s_dns2 && !nm_utils_ipaddr_valid (family, s_dns2)) { + if (s_dns2 && !nm_utils_ipaddr_is_valid (family, s_dns2)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid DNS2 address '%s'.", s_dns2); return FALSE; |