zebra: nht resolve-via-default doesn't need force

We don't need to use the 'force' flag when processing the
resolve-via-default clis for ip and ipv6: we can just do normal
nht processing. [7.5 version]

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 9b91cf47a8ddec94f58792a02a51aa95f35c2434..fe75d845933e040b49d4298c6b84158478e04e00 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1275,7 +1275,7 @@ DEFUN (ip_nht_default_route,
 
        zvrf->zebra_rnh_ip_default_route = 1;
 
-       zebra_evaluate_rnh(zvrf, AFI_IP, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(zvrf, AFI_IP, 0, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1571,7 +1571,7 @@ DEFUN (no_ip_nht_default_route,
                return CMD_SUCCESS;
 
        zvrf->zebra_rnh_ip_default_route = 0;
-       zebra_evaluate_rnh(zvrf, AFI_IP, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(zvrf, AFI_IP, 0, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1591,7 +1591,7 @@ DEFUN (ipv6_nht_default_route,
                return CMD_SUCCESS;
 
        zvrf->zebra_rnh_ipv6_default_route = 1;
-       zebra_evaluate_rnh(zvrf, AFI_IP6, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(zvrf, AFI_IP6, 0, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }
 
@@ -1613,7 +1613,7 @@ DEFUN (no_ipv6_nht_default_route,
                return CMD_SUCCESS;
 
        zvrf->zebra_rnh_ipv6_default_route = 0;
-       zebra_evaluate_rnh(zvrf, AFI_IP6, 1, RNH_NEXTHOP_TYPE, NULL);
+       zebra_evaluate_rnh(zvrf, AFI_IP6, 0, RNH_NEXTHOP_TYPE, NULL);
        return CMD_SUCCESS;
 }