proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-15 20:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Donald Sharp 2017-05-09 20:39:35 -04:00
commit a1b4f854b0
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bgpd/bgpd.c
View File

@ -2955,9 +2955,12 @@ bgp_create (as_t *as, const char *name, enum bgp_instance_type inst_type)
bgp->as = *as; bgp->as = *as;
#if ENABLE_BGP_VNC #if ENABLE_BGP_VNC
if (inst_type != BGP_INSTANCE_TYPE_VRF)
{
bgp->rfapi = bgp_rfapi_new(bgp); bgp->rfapi = bgp_rfapi_new(bgp);
assert(bgp->rfapi); assert(bgp->rfapi);
assert(bgp->rfapi_cfg); assert(bgp->rfapi_cfg);
}
#endif /* ENABLE_BGP_VNC */ #endif /* ENABLE_BGP_VNC */
if (name) if (name)

2
bgpd/rfapi/bgp_rfapi_cfg.c
View File

@ -4281,6 +4281,8 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
int write = 0; int write = 0;
afi_t afi; afi_t afi;
int type; int type;
if (bgp->rfapi == NULL || hc == NULL)
return write;
vty_out (vty, "!%s", VTY_NEWLINE); vty_out (vty, "!%s", VTY_NEWLINE);
for (ALL_LIST_ELEMENTS (hc->nve_groups_sequential, node, nnode, rfg)) for (ALL_LIST_ELEMENTS (hc->nve_groups_sequential, node, nnode, rfg))

1
debian/frr.postinst vendored
View File

@ -15,7 +15,6 @@ frrvtygid=`egrep "^frrvty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
chown -R ${frruid}:${frrgid} /etc/frr chown -R ${frruid}:${frrgid} /etc/frr
touch /etc/frr/vtysh.conf touch /etc/frr/vtysh.conf
chgrp ${frrvtygid} /etc/frr/vtysh* chgrp ${frrvtygid} /etc/frr/vtysh*
chmod 440 /etc/sudoers.d/frr_sudoers
chmod 644 /etc/frr/* chmod 644 /etc/frr/*
ENVIRONMENTFILE=/etc/environment ENVIRONMENTFILE=/etc/environment

15
tools/etc/sudoers.d/frr_sudoers
View File

@ -1,15 +0,0 @@
Defaults env_keep += VTYSH_PAGER
# Allow user in group frr to run vtysh show commands
# without a password by uncommenting the "%frr" line below.
# Subshell commands need to be disallowed, including
# preventing the user passing command line args like 'start-shell'
# Since vtysh allows minimum non-conflicting prefix'es, that means
# anything beginning with the string "st" in any arg. That's a bit
# restrictive.
# Instead, use NOEXEC, to prevent any exec'ed commands.
Cmnd_Alias VTY_SHOW = /usr/bin/vtysh -c show *
# %frr ALL = (root) NOPASSWD:NOEXEC: VTY_SHOW