6 files changed, 18 insertions, 19 deletions
diff --git a/debian/frr.logrotate b/debian/frr.logrotate
index 1dc9122ac4..a6b2b22f56 100644
--- a/debian/frr.logrotate
+++ b/debian/frr.logrotate
@@ -17,7 +17,7 @@
             # open, as well as the daemons, so always signal the daemons.
             # It's safe, a NOP if (only) syslog is being used.
             for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd \
-                pimd ripd ripngd zebra staticd fabricd; do
+                pimd ripd ripngd zebra pbrd staticd bfdd fabricd vrrpd; do
                 if [ -e /var/run/frr/$i.pid ] ; then
                     pids="$pids $(cat /var/run/frr/$i.pid)"
                 fi
diff --git a/doc/developer/building-frr-for-centos6.rst b/doc/developer/building-frr-for-centos6.rst
index 3d9edbe3a1..04c6b922ce 100644
--- a/doc/developer/building-frr-for-centos6.rst
+++ b/doc/developer/building-frr-for-centos6.rst
@@ -213,7 +213,7 @@ Install daemon config file
 
 .. code-block:: shell
 
-   sudo install -p -m 644 redhat/daemons /etc/frr/
+   sudo install -p -m 644 tools/etc/frr/daemons /etc/frr/
    sudo chown frr:frr /etc/frr/daemons
 
 Edit /etc/frr/daemons as needed to select the required daemons
@@ -241,12 +241,12 @@ Load the modified sysctl's on the system:
 
    sudo sysctl -p /etc/sysctl.d/90-routing-sysctl.conf
 
-Add init.d startup files
-^^^^^^^^^^^^^^^^^^^^^^^^
+Add init.d startup file
+^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: shell
 
-   sudo install -p -m 755 redhat/frr.init /etc/init.d/frr
+   sudo install -p -m 755 tools/frr /etc/init.d/frr
    sudo chkconfig --add frr
 
 Enable FRR daemon at startup
diff --git a/doc/developer/building-frr-for-centos7.rst b/doc/developer/building-frr-for-centos7.rst
index cd90d41ffb..eb97150d67 100644
--- a/doc/developer/building-frr-for-centos7.rst
+++ b/doc/developer/building-frr-for-centos7.rst
@@ -104,7 +104,7 @@ Install daemon config file
 
 ::
 
-    sudo install -p -m 644 redhat/daemons /etc/frr/
+    sudo install -p -m 644 tools/etc/frr/daemons /etc/frr/
     sudo chown frr:frr /etc/frr/daemons
 
 Edit /etc/frr/daemons as needed to select the required daemons
@@ -133,13 +133,12 @@ Load the modified sysctl's on the system:
 
     sudo sysctl -p /etc/sysctl.d/90-routing-sysctl.conf
 
-Install frr Service and redhat init files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Install frr Service
+^^^^^^^^^^^^^^^^^^^
 
 ::
 
-    sudo install -p -m 644 redhat/frr.service /usr/lib/systemd/system/frr.service
-    sudo install -p -m 755 redhat/frr.init /usr/lib/frr/frr
+    sudo install -p -m 644 tools/frr.service /usr/lib/systemd/system/frr.service
 
 Register the systemd files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/doc/developer/building-frr-for-centos8.rst b/doc/developer/building-frr-for-centos8.rst
index 7751482b19..75beb53378 100644
--- a/doc/developer/building-frr-for-centos8.rst
+++ b/doc/developer/building-frr-for-centos8.rst
@@ -97,7 +97,7 @@ Install daemon config file
 
 ::
 
-    sudo install -p -m 644 redhat/daemons /etc/frr/
+    sudo install -p -m 644 tools/etc/frr/daemons /etc/frr/
     sudo chown frr:frr /etc/frr/daemons
 
 Edit /etc/frr/daemons as needed to select the required daemons
@@ -126,13 +126,12 @@ Load the modified sysctl's on the system:
 
     sudo sysctl -p /etc/sysctl.d/90-routing-sysctl.conf
 
-Install frr Service and redhat init files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Install frr Service
+^^^^^^^^^^^^^^^^^^^
 
 ::
 
-    sudo install -p -m 644 redhat/frr.service /usr/lib/systemd/system/frr.service
-    sudo install -p -m 755 redhat/frr.init /usr/lib/frr/frr
+    sudo install -p -m 644 tools/frr.service /usr/lib/systemd/system/frr.service
 
 Register the systemd files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/doc/developer/building-frr-for-fedora.rst b/doc/developer/building-frr-for-fedora.rst
index d8405eb351..4ab59490fd 100644
--- a/doc/developer/building-frr-for-fedora.rst
+++ b/doc/developer/building-frr-for-fedora.rst
@@ -110,13 +110,12 @@ And load the kernel modules on the running system:
       sudo systemctl stop firewalld.service
       sudo iptables -F
 
-Install service files
-^^^^^^^^^^^^^^^^^^^^^
+Install frr Service
+^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: console
 
-   sudo install -p -m 644 redhat/frr.service /usr/lib/systemd/system/frr.service
-   sudo install -p -m 755 redhat/frr.init /usr/lib/frr/frr
+   sudo install -p -m 644 tools/frr.service /usr/lib/systemd/system/frr.service
    sudo systemctl enable frr
 
 Enable daemons
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index b48756302a..757623a04e 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -1367,6 +1367,8 @@ static int _zebra_ptm_bfd_client_deregister(struct zserv *zs)
 
 	zebra_ptm_send_bfdd(msg);
 
+	stream_free(msg);
+
 	pp_free(pp);
 
 	return 0;