Merge remote-tracking branch 'origin/master' into pim_lib_work2

67 files changed, 100 insertions, 51 deletions

diff --git a/pimd/AUTHORS b/pimd/AUTHORS
index aa58d958e1..08869ff6fb 100644
--- a/pimd/AUTHORS
+++ b/pimd/AUTHORS
@@ -1,4 +1,3 @@
-
 # Everton da Silva Marques <everton.marques@gmail.com>
 $ more ~/.gitconfig
 [user]
diff --git a/pimd/DEBUG b/pimd/DEBUG
index ea1b14158d..b87542a4a2 100644
--- a/pimd/DEBUG
+++ b/pimd/DEBUG
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
 DEBUG HINTS
 
   - Check the source is issuing multicast packets with TTL high enough
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index 2bfe9c91ca..314a744339 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in.
-## $QuaggaId: $Format:%an, %ai, %h$ $
 
 # qpimd - pimd for quagga
 # Copyright (C) 2008 Everton da Silva Marques
diff --git a/pimd/README b/pimd/README
index 9f7776fb45..c8997808b6 100644
--- a/pimd/README
+++ b/pimd/README
@@ -1,6 +1,3 @@
-#
-#
-
 INTRODUCTION
 
         qpimd aims to implement a PIM (Protocol Independent Multicast)
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index f28e2c0e85..385b897bf9 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h
index c1f314f85b..ec18cab85e 100644
--- a/pimd/pim_assert.h
+++ b/pimd/pim_assert.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_ASSERT_H
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 3646145309..50578bf1e8 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h
index 2d09da4b58..e08cefb29b 100644
--- a/pimd/pim_cmd.h
+++ b/pimd/pim_cmd.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_CMD_H
diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index dd827c43b7..3d7ae4ad22 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h
index 3ab83db5eb..f8e722cd04 100644
--- a/pimd/pim_hello.h
+++ b/pimd/pim_hello.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_HELLO_H
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 0b5c7cc1eb..7b2c7e2e93 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -15,7 +15,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 17bbbd9937..bd4ebd257d 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -16,8 +16,7 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-*/
+s*/
 
 #ifndef PIM_IFACE_H
 #define PIM_IFACE_H
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 77d8e82eec..07318791e7 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index a95f66551b..c1ce52449a 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_IFCHANNEL_H
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 456b9ad742..a309de690b 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index c9000e3fd9..802f1ba471 100644
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_IGMP_H
diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h
index 2c72a4bea6..d9542732b8 100644
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_IGMP_JOIN_H
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 987ab895ae..4de3b65ec5 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h
index 33a918bad1..893fba60f2 100644
--- a/pimd/pim_igmpv3.h
+++ b/pimd/pim_igmpv3.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_IGMPV3_H
diff --git a/pimd/pim_int.c b/pimd/pim_int.c
index e922620f0d..44b8386a3d 100644
--- a/pimd/pim_int.c
+++ b/pimd/pim_int.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_int.h b/pimd/pim_int.h
index a0f281ccd8..a6349b5b3d 100644
--- a/pimd/pim_int.h
+++ b/pimd/pim_int.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_INT_H
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index c0535c4844..db17c3faec 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_join.h b/pimd/pim_join.h
index fadb613592..27333243db 100644
--- a/pimd/pim_join.h
+++ b/pimd/pim_join.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_JOIN_H
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index c339fce49d..127e0f6252 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_macro.h b/pimd/pim_macro.h
index 6cb5d3822e..3079ca80cc 100644
--- a/pimd/pim_macro.h
+++ b/pimd/pim_macro.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_MACRO_H
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 7fc9bc524e..e7b86a0404 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
@@ -76,9 +79,9 @@ zebra_capabilities_t _caps_p [] =
 /* pimd privileges to run with */
 struct zebra_privs_t pimd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -166,7 +169,7 @@ int main(int argc, char** argv, char** envp) {
       break;
     case 'v':
       printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION);
-      print_version(QUAGGA_PROGNAME);
+      print_version(progname);
       exit (0);
       break;
     case 'h':
@@ -181,7 +184,7 @@ int main(int argc, char** argv, char** envp) {
   master = thread_master_create();
 
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting",
-	      QUAGGA_VERSION, PIMD_VERSION);
+	      FRR_VERSION, PIMD_VERSION);
 
   /* 
    * Initializations
@@ -232,7 +235,7 @@ int main(int argc, char** argv, char** envp) {
   vty_serv_sock(vty_addr, vty_port, PIM_VTYSH_PATH);
 
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d",
-	      QUAGGA_VERSION, PIMD_VERSION, vty_port);
+	      FRR_VERSION, PIMD_VERSION, vty_port);
 
 #ifdef PIM_DEBUG_BYDEFAULT
   zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands");
@@ -256,12 +259,6 @@ int main(int argc, char** argv, char** envp) {
   zlog_notice("PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall");
 #endif
 
-#ifdef HAVE_CLOCK_MONOTONIC
-  zlog_notice("HAVE_CLOCK_MONOTONIC");
-#else
-  zlog_notice("!HAVE_CLOCK_MONOTONIC");
-#endif
-
   while (thread_fetch(master, &thread))
     thread_call(&thread);
 
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 1489c70f08..8e97233d4b 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h
index b3f56aa724..3c15c800da 100644
--- a/pimd/pim_mroute.h
+++ b/pimd/pim_mroute.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_MROUTE_H
diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index d511123f98..e1f20b1496 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_msg.h b/pimd/pim_msg.h
index 78ff569b7c..5229f85c72 100644
--- a/pimd/pim_msg.h
+++ b/pimd/pim_msg.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_MSG_H
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index d253ef5412..346b911157 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index b5bd5f6244..9e419aec18 100644
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_NEIGHBOR_H
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index aa059797da..1c0a2f2bea 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h
index 64107bfe88..143cfb7942 100644
--- a/pimd/pim_oil.h
+++ b/pimd/pim_oil.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_OIL_H
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index f9d74ff039..1dbbd7c655 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h
index abb3e50c00..1f7e1e5d4f 100644
--- a/pimd/pim_pim.h
+++ b/pimd/pim_pim.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_PIM_H
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 9c18c2482a..e48320222f 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_rpf.h b/pimd/pim_rpf.h
index e54aa51256..bb77775324 100644
--- a/pimd/pim_rpf.h
+++ b/pimd/pim_rpf.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_RPF_H
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 8e14627e4d..0a60bba252 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h
index b05dbb39cb..8a3f836fa3 100644
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_SIGNALS_H
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index e69ad98f8c..de56eb6076 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_sock.h b/pimd/pim_sock.h
index c47d08f440..aaf82e862a 100644
--- a/pimd/pim_sock.h
+++ b/pimd/pim_sock.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_SOCK_H
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index 00abc5f60a..e443a92d61 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h
index ab3351cde1..29759c9531 100644
--- a/pimd/pim_ssmpingd.h
+++ b/pimd/pim_ssmpingd.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_SSMPINGD_H
diff --git a/pimd/pim_static.c b/pimd/pim_static.c
index c3c40ff210..e1ccec387a 100644
--- a/pimd/pim_static.c
+++ b/pimd/pim_static.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_static.h b/pimd/pim_static.h
index 33f700ea78..c288aa7ff4 100644
--- a/pimd/pim_static.h
+++ b/pimd/pim_static.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
 */
 
 #ifndef PIM_STATIC_H_
diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index 5144031794..7f814fcda8 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_str.h b/pimd/pim_str.h
index da72573570..3536417a95 100644
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_STR_H
diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 9bae661ba9..348793cd0b 100644
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_time.h b/pimd/pim_time.h
index 9f811f1b94..de304a9f71 100644
--- a/pimd/pim_time.h
+++ b/pimd/pim_time.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_TIME_H
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index dcded95035..2b2a06d368 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h
index ee7692ab80..d176c26471 100644
--- a/pimd/pim_tlv.h
+++ b/pimd/pim_tlv.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_TLV_H
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index d111289e5a..fbb7d84a25 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index 026cd7b9d6..1a50c0c6e3 100644
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_UPSTREAM_H
diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index 1b1b5ef8f3..6d7a8c1908 100644
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index 3a7844b402..fbb7b0196b 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_UTIL_H
diff --git a/pimd/pim_version.c b/pimd/pim_version.c
index 32020f6a83..a43c27d5b5 100644
--- a/pimd/pim_version.c
+++ b/pimd/pim_version.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_version.h b/pimd/pim_version.h
index a4b34d1063..64e07862d6 100644
--- a/pimd/pim_version.h
+++ b/pimd/pim_version.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_VERSION_H
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 8815813ce1..ee4fcd3150 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h
index 787af60c3b..37ec07b2bf 100644
--- a/pimd/pim_vty.h
+++ b/pimd/pim_vty.h
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #ifndef PIM_VTY_H
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 41934074e1..b21da624d6 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zebra.h b/pimd/pim_zebra.h
index 767cdf0541..0c302efbd5 100644
--- a/pimd/pim_zebra.h
+++ b/pimd/pim_zebra.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_ZEBRA_H
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index f3193b28db..61e3e27261 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zlookup.h b/pimd/pim_zlookup.h
index ce85c8eba9..d8e7ff9e0d 100644
--- a/pimd/pim_zlookup.h
+++ b/pimd/pim_zlookup.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIM_ZLOOKUP_H
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 0e5313906f..1627c4048d 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #include <zebra.h>
diff --git a/pimd/pimd.h b/pimd/pimd.h
index cb0165c22c..20cf3c2dd2 100644
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -16,7 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
 */
 
 #ifndef PIMD_H
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index a345945ea4..81da867e03 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -16,7 +16,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>