diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-21 15:11:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-05 23:55:07 +0100 |
| commit | cc27028d4fc2a21d1d2d945cb4e8b99f5b53142e (patch) | |
| tree | 02480546a3608861dd0e0df6851c268c55de3c42 | |
| parent | 2db5a5372e93772ae6b28717b03f9dde680e1bc1 (diff) | |
| download | NetworkManager-cc27028d4fc2a21d1d2d945cb4e8b99f5b53142e.tar.gz | |
libnm: allow zero length prefix in NMIP4Route and NMIP6Route
Note that since older library versions in libnm-util contain this
assert, you cannot set the prefix to zero without breaking compatibility.
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | libnm-core/nm-setting-ip4-config.c | 3 | ||||
| -rw-r--r-- | libnm-core/nm-setting-ip6-config.c | 3 | ||||
| -rw-r--r-- | libnm-util/nm-setting-ip4-config.c | 3 | ||||
| -rw-r--r-- | libnm-util/nm-setting-ip6-config.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index f44c3be260..1500212231 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -1916,7 +1916,8 @@ nm_ip4_route_set_prefix (NMIP4Route *route, guint32 prefix) g_return_if_fail (route != NULL); g_return_if_fail (route->refcount > 0); g_return_if_fail (prefix <= 32); - g_return_if_fail (prefix > 0); + + /* Note that older versions in libnm-util assert that the prefix is a positive number. */ route->prefix = prefix; } diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index b007880c19..89e8e3aab1 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -1700,7 +1700,8 @@ nm_ip6_route_set_prefix (NMIP6Route *route, guint32 prefix) g_return_if_fail (route != NULL); g_return_if_fail (route->refcount > 0); g_return_if_fail (prefix <= 128); - g_return_if_fail (prefix > 0); + + /* Note that older versions in libnm-util assert that the prefix is a positive number. */ route->prefix = prefix; } diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index c7a730769c..5aa3270512 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1878,7 +1878,8 @@ nm_ip4_route_set_prefix (NMIP4Route *route, guint32 prefix) g_return_if_fail (route != NULL); g_return_if_fail (route->refcount > 0); g_return_if_fail (prefix <= 32); - g_return_if_fail (prefix > 0); + + /* Note that older versions assert that the prefix is a positive number. */ route->prefix = prefix; } diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 64a81136a9..6625fbdc95 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -1758,7 +1758,8 @@ nm_ip6_route_set_prefix (NMIP6Route *route, guint32 prefix) g_return_if_fail (route != NULL); g_return_if_fail (route->refcount > 0); g_return_if_fail (prefix <= 128); - g_return_if_fail (prefix > 0); + + /* Note that older versions assert that the prefix is a positive number. */ route->prefix = prefix; } |