Merge branch 'merge' of /home/shemminger/git/quagga into upstream

Conflicts:

	HACKING
	INSTALL.quagga.txt
	README.NetBSD
	bgpd/IMPLEMENTATION.txt
	bgpd/bgpd.conf.sample
	configure.ac
	isisd/dict.c
	isisd/dict.h
	lib/command.c
	lib/log.c
	lib/log.h
	lib/md5.c
	lib/md5.h
	lib/memtypes.awk
	lib/memtypes.c
	lib/route_types.awk
	lib/str.h
	lib/zassert.h
	mkinstalldirs
	ospfd/OSPF-ALIGNMENT.txt
	pkgsrc/README.txt
	ripd/ripd.conf.sample
	ripngd/ripngd.conf.sample
	solaris/Makefile.am
	solaris/quagga.init.in
	tests/heavy-thread.c
	tests/heavy-wq.c
	tests/heavy.c
	tests/main.c
	tests/test-privs.c
	watchquagga/watchquagga.c
	zebra/client_main.c
	zebra/zebra.conf.sample

33 files changed, 35 insertions, 35 deletions

diff --git a/HACKING b/HACKING
index 3fc3fb40..7c92604a 100644
--- a/HACKING
+++ b/HACKING
@@ -1,5 +1,5 @@
 -*- mode: text; -*-
-$Id$
+$Id: HACKING,v 1.21 2005/11/10 10:21:19 paul Exp $
 
 GUIDELINES FOR HACKING ON QUAGGA
 
diff --git a/INSTALL.quagga.txt b/INSTALL.quagga.txt
index f627c922..4a5d2961 100644
--- a/INSTALL.quagga.txt
+++ b/INSTALL.quagga.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: INSTALL.quagga.txt,v 1.13 2007/02/06 19:56:31 gdt Exp $
 
 --------------------------------------------------------------------------
 Building and Installing Quagga from releases or snapshots:
diff --git a/README.NetBSD b/README.NetBSD
index 55e54af8..23bc886c 100755
--- a/README.NetBSD
+++ b/README.NetBSD
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-$Id$
+$Id: README.NetBSD,v 1.5 2007/08/02 13:38:38 gdt Exp $
 
 # This file is helpful for building quagga from cvs on NetBSD, and
 # probably on any system using pkgsrc.  
diff --git a/bgpd/IMPLEMENTATION.txt b/bgpd/IMPLEMENTATION.txt
index ac087a38..fff360ab 100644
--- a/bgpd/IMPLEMENTATION.txt
+++ b/bgpd/IMPLEMENTATION.txt
@@ -1,4 +1,4 @@
-$Id$
+$Id: IMPLEMENTATION.txt,v 1.2 2005/02/15 17:10:03 gdt Exp $
 
 This file contains notes about the internals of the BGP
 implementation.  The initial impetus is understanding the memory usage
diff --git a/bgpd/bgpd.conf.sample b/bgpd/bgpd.conf.sample
index 62cacc85..b6a8b6f1 100644
--- a/bgpd/bgpd.conf.sample
+++ b/bgpd/bgpd.conf.sample
@@ -2,7 +2,7 @@
 !
 ! BGPd sample configuratin file
 !
-! $Id$
+! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
 !
 hostname bgpd
 password zebra
diff --git a/configure.ac b/configure.ac
index 5e1fc96e..b9eb4430 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id$
+## $Id: configure.ac,v 1.141 2008/01/11 16:33:59 ajs Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.9, [http://bugzilla.quagga.net])
diff --git a/isisd/dict.c b/isisd/dict.c
index 6c3e1e7f..8a7dc588 100644
--- a/isisd/dict.c
+++ b/isisd/dict.c
@@ -14,8 +14,8 @@
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
  *
- * $Id$
- * $Name$
+ * $Id: dict.c,v 1.5 2007/08/07 18:49:18 paul Exp $
+ * $Name:  $
  */
 
 #include <stdlib.h>
diff --git a/isisd/dict.h b/isisd/dict.h
index 92972061..9395d1c0 100644
--- a/isisd/dict.h
+++ b/isisd/dict.h
@@ -14,8 +14,8 @@
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
  *
- * $Id$
- * $Name$
+ * $Id: dict.h,v 1.3 2005/09/25 12:04:25 hasso Exp $
+ * $Name:  $
  */
 
 #ifndef DICT_H
diff --git a/lib/command.c b/lib/command.c
index f3d96ede..270bf0d3 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,5 @@
 /*
-   $Id$
+   $Id: command.c,v 1.55 2007/04/28 22:14:10 ajs Exp $
  
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
diff --git a/lib/log.c b/lib/log.c
index ce00bfbb..df630099 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: log.c,v 1.34 2008/02/28 23:26:02 paul Exp $
  *
  * Logging of zebra
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
diff --git a/lib/log.h b/lib/log.h
index 7432b25e..691368c0 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: log.h,v 1.20 2008/02/28 23:26:02 paul Exp $
  *
  * Zebra logging funcions.
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
diff --git a/lib/md5.c b/lib/md5.c
index 887059a5..f1bd0668 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -1,6 +1,6 @@
 /* $USAGI: md5.c,v 1.2 2000/11/02 11:59:24 yoshfuji Exp $ */
 /*	$KAME: md5.c,v 1.2 2000/05/27 07:07:48 jinmei Exp $	*/
-/*	$Id$ */
+/*	$Id: md5.c,v 1.6 2006/01/17 23:39:04 vincent Exp $ */
 
 /*
  * Copyright (C) 2004 6WIND
diff --git a/lib/md5.h b/lib/md5.h
index 6078ac1f..89b9a320 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,6 +1,6 @@
 /* $USAGI: md5.h,v 1.2 2000/11/02 11:59:25 yoshfuji Exp $ */
 /*	$KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $	*/
-/*	$Id$ */
+/*	$Id: md5.h,v 1.3 2006/01/17 17:40:45 paul Exp $ */
 
 /*
  * Copyright (C) 2004 6WIND
diff --git a/lib/memtypes.awk b/lib/memtypes.awk
index fbd5e251..5429f6e8 100644
--- a/lib/memtypes.awk
+++ b/lib/memtypes.awk
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: memtypes.awk,v 1.4 2006/03/30 14:30:19 paul Exp $
 #
 # Scan a file of memory definitions (see eg memtypes.c) and generate
 # a corresponding header file with an enum of the MTYPE's and declarations
diff --git a/lib/memtypes.c b/lib/memtypes.c
index f1b10e71..c7028c9e 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -6,7 +6,7 @@
  * The script is sensitive to the format (though not whitespace), see
  * the top of memtypes.awk for more details.
  *
- * $Id$
+ * $Id: memtypes.c,v 1.12 2007/05/04 20:15:47 paul Exp $
  */
 
 #include "zebra.h"
diff --git a/lib/route_types.awk b/lib/route_types.awk
index eb3d382a..6078406c 100644
--- a/lib/route_types.awk
+++ b/lib/route_types.awk
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: route_types.awk,v 1.3 2006/06/27 10:42:18 paul Exp $
 #
 # Scan a file of route-type definitions (see eg route_types.txt) and
 # generate a corresponding header file with:
diff --git a/lib/str.h b/lib/str.h
index bcee8af0..7b83fe1c 100644
--- a/lib/str.h
+++ b/lib/str.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: str.h,v 1.4 2005/09/19 09:53:21 hasso Exp $
  */
 
 #ifndef _ZEBRA_STR_H
diff --git a/lib/zassert.h b/lib/zassert.h
index 525d866c..79126760 100644
--- a/lib/zassert.h
+++ b/lib/zassert.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: zassert.h,v 1.2 2004/12/03 18:01:04 ajs Exp $
  */
 
 #ifndef _QUAGGA_ASSERT_H
diff --git a/mkinstalldirs b/mkinstalldirs
index 994d71ce..86e2b5ed 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id$
+# $Id: mkinstalldirs,v 1.2 2003/02/17 23:54:05 paul Exp $
 
 errstatus=0
 dirmode=""
diff --git a/ospfd/OSPF-ALIGNMENT.txt b/ospfd/OSPF-ALIGNMENT.txt
index a5fe931b..dac6182f 100644
--- a/ospfd/OSPF-ALIGNMENT.txt
+++ b/ospfd/OSPF-ALIGNMENT.txt
@@ -1,4 +1,4 @@
-$Id$
+$Id: OSPF-ALIGNMENT.txt,v 1.1 2004/11/17 17:59:52 gdt Exp $
 
 Greg Troxel <gdt@ir.bbn.com>
 2004-11-17
diff --git a/pkgsrc/README.txt b/pkgsrc/README.txt
index 1cae5c14..13ec449a 100644
--- a/pkgsrc/README.txt
+++ b/pkgsrc/README.txt
@@ -1,4 +1,4 @@
-$Id$
+$Id: README.txt,v 1.1 2004/08/27 15:57:35 gdt Exp $
 
 This directory contains files for use with the pkgsrc framework
 (http://www.pkgsrc.org) used with NetBSD and other operating systems.
diff --git a/ripd/ripd.conf.sample b/ripd/ripd.conf.sample
index f72e5e85..2902ff9c 100644
--- a/ripd/ripd.conf.sample
+++ b/ripd/ripd.conf.sample
@@ -2,7 +2,7 @@
 !
 ! RIPd sample configuration file
 !
-! $Id$
+! $Id: ripd.conf.sample,v 1.1 2002/12/13 20:15:30 paul Exp $
 !
 hostname ripd
 password zebra
diff --git a/ripngd/ripngd.conf.sample b/ripngd/ripngd.conf.sample
index 1daf3b39..ad673e57 100644
--- a/ripngd/ripngd.conf.sample
+++ b/ripngd/ripngd.conf.sample
@@ -2,7 +2,7 @@
 !
 ! RIPngd sample configuration file
 !
-! $Id$
+! $Id: ripngd.conf.sample,v 1.1 2002/12/13 20:15:30 paul Exp $
 !
 hostname ripngd
 password zebra
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index 674f4ebf..835d3a70 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -1,5 +1,5 @@
 # Solaris packages automake file
-# $Id$
+# $Id: Makefile.am,v 1.9 2008/01/13 18:52:15 paul Exp $
 
 # XXX This file uses GNU make extensions.
 
diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in
index 30a9c694..7d04b70d 100755
--- a/solaris/quagga.init.in
+++ b/solaris/quagga.init.in
@@ -20,7 +20,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 #
-# $Id$
+# $Id: quagga.init.in,v 1.7 2007/02/22 17:55:20 paul Exp $
 #
 # Starts/stops the given daemon
 
diff --git a/tests/heavy-thread.c b/tests/heavy-thread.c
index 80f73cee..cd3a3b9d 100644
--- a/tests/heavy-thread.c
+++ b/tests/heavy-thread.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: heavy-thread.c,v 1.2 2005/04/25 16:42:24 paul Exp $
  *
  * This file is part of Quagga.
  *
diff --git a/tests/heavy-wq.c b/tests/heavy-wq.c
index a2c609d4..543b9dbb 100644
--- a/tests/heavy-wq.c
+++ b/tests/heavy-wq.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: heavy-wq.c,v 1.4 2006/08/27 06:53:24 paul Exp $
  *
  * This file is part of Quagga.
  *
diff --git a/tests/heavy.c b/tests/heavy.c
index d9bde8e2..577a4816 100644
--- a/tests/heavy.c
+++ b/tests/heavy.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: heavy.c,v 1.3 2005/04/25 16:42:24 paul Exp $
  *
  * This file is part of Quagga.
  *
diff --git a/tests/main.c b/tests/main.c
index 19e00082..edc3b2de 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: main.c,v 1.1 2005/04/25 16:42:24 paul Exp $
  *
  * This file is part of Quagga.
  *
diff --git a/tests/test-privs.c b/tests/test-privs.c
index c0e0d821..a888ea0f 100644
--- a/tests/test-privs.c
+++ b/tests/test-privs.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: test-privs.c,v 1.1 2005/10/11 03:48:28 paul Exp $
  *
  * This file is part of Quagga.
  *
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index f4c483cf..90cff00f 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,5 +1,5 @@
 /*
-    $Id$
+    $Id: watchquagga.c,v 1.12 2007/05/10 02:38:52 paul Exp $
 
     Monitor status of quagga daemons and restart if necessary.
 
diff --git a/zebra/client_main.c b/zebra/client_main.c
index e59b09d0..c319aac7 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: client_main.c,v 1.1 2002/12/13 20:15:30 paul Exp $
  *
  * GNU Zebra client test main routine.
  * Copyright (C) 1997 Kunihiro Ishiguro
diff --git a/zebra/zebra.conf.sample b/zebra/zebra.conf.sample
index cf135281..a5d0732f 100644
--- a/zebra/zebra.conf.sample
+++ b/zebra/zebra.conf.sample
@@ -2,7 +2,7 @@
 !
 ! zebra sample configuration file
 !
-! $Id$
+! $Id: zebra.conf.sample,v 1.1 2002/12/13 20:15:30 paul Exp $
 !
 hostname Router
 password zebra