Merge pull request #6753 from mjstapp/fix_zebra_backup_sa

zebra: fix SA warnings in backup nexthop code

diff --cc zebra/zebra_mpls.c
index 996afd12dd9418c6011815b378303c3ef06bfc26,fe8f3a85b3ee7914c9b697e602a370068454a52d..27f1f9396c778f93c06bcb50416bbed55a035862
--- 1/zebra/zebra_mpls.c
--- 2/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@@ -3636,9 -3639,10 +3636,9 @@@ int zebra_mpls_static_lsp_add(struct ze
                        return 0;
  
                if (IS_ZEBRA_DEBUG_MPLS) {
-                       snhlfe2str(snhlfe, buf, BUFSIZ);
+                       snhlfe2str(snhlfe, buf, sizeof(buf));
                        zlog_debug(
 -                              "Upd static LSP in-label %u nexthop %s "
 -                              "out-label %u (old %u)",
 +                              "Upd static LSP in-label %u nexthop %s out-label %u (old %u)",
                                in_label, buf, out_label, snhlfe->out_label);
                }
                snhlfe->out_label = out_label;

diff --cc zebra/zebra_rib.c
Simple merge