diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-21 15:11:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-29 17:33:13 +0100 |
| commit | 7dc6e331b87a963999e34c029e49417ff422c863 (patch) | |
| tree | 70f15e16ad3707bd24e7ab5b48a069cec7ccb0d0 | |
| parent | 4a886a8f6f0c93ff425186750f976ccb71c9ce36 (diff) | |
| download | NetworkManager-7dc6e331b87a963999e34c029e49417ff422c863.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; } |