From b1f58fcd9545248d41ad97bbcb0efa338e3efe29 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 11 Apr 2016 12:31:05 +0200 Subject: [PATCH] libnm-core: allow zero prefix length in NMIPAddress Adding addresses with a prefix of zero is valid. Don't reject them. Note that this is an actual bug. If you configure an address with prefix length zero, nmcli will report: $nmcli connection (process:1040): libnm-WARNING **: Ignoring invalid IP4 address: Invalid IPv4 address prefix '0' (cherry picked from commit 57860c329e2f2561854671a43803bbf31f05a723) --- libnm-core/nm-setting-ip-config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 45b0b768f8..1b822072b7 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -214,7 +214,7 @@ nm_ip_address_new (int family, if (!valid_ip (family, addr, error)) return NULL; - if (!valid_prefix (family, prefix, error, FALSE)) + if (!valid_prefix (family, prefix, error, TRUE)) return NULL; address = g_slice_new0 (NMIPAddress); @@ -251,7 +251,7 @@ nm_ip_address_new_binary (int family, g_return_val_if_fail (family == AF_INET || family == AF_INET6, NULL); g_return_val_if_fail (addr != NULL, NULL); - if (!valid_prefix (family, prefix, error, FALSE)) + if (!valid_prefix (family, prefix, error, TRUE)) return NULL; address = g_slice_new0 (NMIPAddress); @@ -487,7 +487,7 @@ nm_ip_address_set_prefix (NMIPAddress *address, guint prefix) { g_return_if_fail (address != NULL); - g_return_if_fail (valid_prefix (address->family, prefix, NULL, FALSE)); + g_return_if_fail (valid_prefix (address->family, prefix, NULL, TRUE)); address->prefix = prefix; }