From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 24 Feb 2017 14:32:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~23
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3f3169a2e6d9d710135ea54100b3517fae59290c;p=mirror%2Ffrr.git

Merge remote-tracking branch 'origin/stable/2.0'
---

3f3169a2e6d9d710135ea54100b3517fae59290c
diff --cc bgpd/bgp_updgrp_packet.c
index 02979602bf,fe60fc3fb8..8839de391e
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@@ -618,9 -617,10 +618,11 @@@ static voi
  bgp_info_addpath_tx_str (int addpath_encode, u_int32_t addpath_tx_id,
                           char *buf)
  {
 +  buf[0] = '\0';
    if (addpath_encode)
      sprintf(buf, " with addpath ID %d", addpath_tx_id);
+   else
+     buf[0] = '\0';
  }
  
  /* Make BGP update packet.  */