From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 18 Aug 2010 22:56:46 +0000 (-0700)
Subject: Zebra zserv: bogus conditional
X-Git-Tag: frr-2.0-rc1~2146
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cf8a831bcb53b60a7b5c4b26dda7646ebc7506d8;p=mirror%2Ffrr.git

Zebra zserv: bogus conditional

This looks like a bug in original code from misunderstanding
of C rules of evaluation.
---

diff --git a/zebra/zserv.c b/zebra/zserv.c
index cb5e411cf7..dc3d432bd8 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -451,7 +451,7 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p,
     }
 
   /* Metric */
-  if (cmd == ZEBRA_IPV4_ROUTE_ADD || ZEBRA_IPV6_ROUTE_ADD)
+  if (cmd == ZEBRA_IPV4_ROUTE_ADD || cmd == ZEBRA_IPV6_ROUTE_ADD)
     {
       SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE);
       stream_putc (s, rib->distance);