Merge branch 'master' into fix-proto_redistnum

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc isisd/isis_redist.c
Simple merge

diff --cc lib/log.c
index 3ed41c75e89a717144bea79e1a199f39fb8e488c,6a3ce07799c9e72d77acee3283a5108d5068e02f..d48534dc181ff75493ac69b4be3e2e50bef5fa95
--- 1/lib/log.c
--- 2/lib/log.c
+++ b/lib/log.c
@@@ -1061,49 -1061,49 +1061,49 @@@ proto_redistnum(int afi, const char *s
  
    if (afi == AFI_IP)
      {
 -      if (strncmp (s, "k", 1) == 0)
 +      if (strmatch (s, "kernel"))
        return ZEBRA_ROUTE_KERNEL;
 -      else if (strncmp (s, "c", 1) == 0)
 +      else if (strmatch (s, "connected"))
        return ZEBRA_ROUTE_CONNECT;
 -      else if (strncmp (s, "s", 1) == 0)
 +      else if (strmatch (s, "static"))
        return ZEBRA_ROUTE_STATIC;
 -      else if (strncmp (s, "r", 1) == 0)
 +      else if (strmatch (s, "rip"))
        return ZEBRA_ROUTE_RIP;
 -      else if (strncmp (s, "o", 1) == 0)
 +      else if (strmatch (s, "ospf"))
        return ZEBRA_ROUTE_OSPF;
 -      else if (strncmp (s, "i", 1) == 0)
 +      else if (strmatch (s, "isis"))
        return ZEBRA_ROUTE_ISIS;
 -      else if (strncmp (s, "bg", 2) == 0)
 +      else if (strmatch (s, "bgp"))
        return ZEBRA_ROUTE_BGP;
 -      else if (strncmp (s, "ta", 2) == 0)
 +      else if (strmatch (s, "table"))
        return ZEBRA_ROUTE_TABLE;
 -      else if (strcmp (s, "vnc-direct") == 0)
 -      return ZEBRA_ROUTE_VNC_DIRECT;
 -      else if (strcmp (s, "vnc") == 0)
 +      else if (strmatch (s, "vnc"))
        return ZEBRA_ROUTE_VNC;
-       else if (strmatch (s, "vd"))
++      else if (strmatch (s, "vnc-direct"))
 +      return ZEBRA_ROUTE_VNC_DIRECT;
      }
    if (afi == AFI_IP6)
      {
 -      if (strncmp (s, "k", 1) == 0)
 +      if (strmatch (s, "kernel"))
        return ZEBRA_ROUTE_KERNEL;
 -      else if (strncmp (s, "c", 1) == 0)
 +      else if (strmatch (s, "connected"))
        return ZEBRA_ROUTE_CONNECT;
 -      else if (strncmp (s, "s", 1) == 0)
 +      else if (strmatch (s, "static"))
        return ZEBRA_ROUTE_STATIC;
 -      else if (strncmp (s, "r", 1) == 0)
 +      else if (strmatch (s, "ripng"))
        return ZEBRA_ROUTE_RIPNG;
 -      else if (strncmp (s, "o", 1) == 0)
 +      else if (strmatch (s, "ospf6"))
        return ZEBRA_ROUTE_OSPF6;
 -      else if (strncmp (s, "i", 1) == 0)
 +      else if (strmatch (s, "isis"))
        return ZEBRA_ROUTE_ISIS;
 -      else if (strncmp (s, "bg", 2) == 0)
 +      else if (strmatch (s, "bgp"))
        return ZEBRA_ROUTE_BGP;
 -      else if (strncmp (s, "ta", 2) == 0)
 +      else if (strmatch (s, "table"))
        return ZEBRA_ROUTE_TABLE;
 -      else if (strcmp (s, "vnc-direct") == 0)
 -      return ZEBRA_ROUTE_VNC_DIRECT;
 -      else if (strcmp (s, "vnc") == 0)
 +      else if (strmatch (s, "vnc"))
        return ZEBRA_ROUTE_VNC;
-       else if (strmatch (s, "vd"))
++      else if (strmatch (s, "vnc-direct"))
 +      return ZEBRA_ROUTE_VNC_DIRECT;
      }
    return -1;
  }

diff --cc ospf6d/ospf6_asbr.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc ripd/rip_zebra.c
Simple merge

diff --cc ripngd/ripng_zebra.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/zebra_vty.c
index 2f0fefdc674c33e7df25a6d4204a97cd260e4d70,5dc9a90e1f48021f99b508004a3db98c704799b7..27ef5f934dd7e4aeb1da899dd24955547ad59732
--- 1/zebra/zebra_vty.c
--- 2/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@@ -3351,8 -3356,9 +3351,8 @@@ DEFUN (show_ipv6_route_vrf_all_protocol
         IP_STR
         "IP routing table\n"
         VRF_ALL_CMD_HELP_STR
-        QUAGGA_IP6_REDIST_HELP_STR_ZEBRA)
+        FRR_IP6_REDIST_HELP_STR_ZEBRA)
  {
 -  int idx_protocol = 5;
    int type;
    struct route_table *table;
    struct route_node *rn;