diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-22 14:17:08 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-22 14:33:01 +0200 |
| commit | 47cc91bef609fe6f0ec7c25deff0b0628842c240 (patch) | |
| tree | 22fe22de89b1889d39d809c74ab2d7b3407d6e38 | |
| parent | 3a7c641b022bc919a75e27bb60ccc9bceaf0deff (diff) | |
| download | NetworkManager-47cc91bef609fe6f0ec7c25deff0b0628842c240.tar.gz | |
core: fix handling route-metric for nm_ip4_config_merge()
Fixes: bc75cd53a8c5ba525016bfddc1644be59a45ed41
| -rw-r--r-- | src/nm-ip4-config.c | 2 | ||||
| -rw-r--r-- | src/nm-ip6-config.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 87da7c7545..e23e364578 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -616,7 +616,7 @@ nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src) if (dst_priv->route_metric == -1) dst_priv->route_metric = src_priv->route_metric; - else + else if (src_priv->route_metric != -1) dst_priv->route_metric = MIN (dst_priv->route_metric, src_priv->route_metric); /* domains */ diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 4794a0ae38..1cedff5f5d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -694,7 +694,7 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src) if (dst_priv->route_metric == -1) dst_priv->route_metric = src_priv->route_metric; - else + else if (src_priv->route_metric != -1) dst_priv->route_metric = MIN (dst_priv->route_metric, src_priv->route_metric); /* domains */ |