activated Id property

98 files changed, 98 insertions, 96 deletions

diff --git a/src/pluto/ac.c b/src/pluto/ac.c
index 09dd548a8..3e0a2072c 100644
--- a/src/pluto/ac.c
+++ b/src/pluto/ac.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ac.c,v 1.12 2005/12/06 22:49:32 as Exp $
+ * $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/ac.h b/src/pluto/ac.h
index 3913d745d..f61baca26 100644
--- a/src/pluto/ac.h
+++ b/src/pluto/ac.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ac.h,v 1.8 2005/02/17 20:56:04 as Exp $
+ * $Id$
  */
 
 #ifndef _AC_H
diff --git a/src/pluto/adns.c b/src/pluto/adns.c
index c5977d23c..637207fab 100644
--- a/src/pluto/adns.c
+++ b/src/pluto/adns.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: adns.c,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef USE_LWRES	/* whole file! */
diff --git a/src/pluto/adns.h b/src/pluto/adns.h
index 00fc4ad07..e5be969a9 100644
--- a/src/pluto/adns.h
+++ b/src/pluto/adns.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: adns.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef USE_LWRES	/* whole file! */
diff --git a/src/pluto/alg_info.c b/src/pluto/alg_info.c
index ac5d1672f..83198b3fb 100644
--- a/src/pluto/alg_info.c
+++ b/src/pluto/alg_info.c
@@ -2,7 +2,7 @@
  * Algorithm info parsing and creation functions
  * Author: JuanJo Ciarlante <jjo-ipsec@mendoza.gov.ar>
  *
- * $Id: alg_info.c,v 1.5 2004/09/29 22:42:49 as Exp $
+ * $Id$
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/pluto/alg_info.h b/src/pluto/alg_info.h
index cd2011dcc..59894a4e2 100644
--- a/src/pluto/alg_info.h
+++ b/src/pluto/alg_info.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: alg_info.h,v 1.4 2004/09/29 22:39:44 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef ALG_INFO_H
diff --git a/src/pluto/asn1.c b/src/pluto/asn1.c
index 3b79c24b4..dafc6b19c 100644
--- a/src/pluto/asn1.c
+++ b/src/pluto/asn1.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: asn1.c,v 1.16 2006/01/04 21:00:43 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/asn1.h b/src/pluto/asn1.h
index 2a3fb3e9e..cead90a45 100644
--- a/src/pluto/asn1.h
+++ b/src/pluto/asn1.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: asn1.h,v 1.14 2005/12/06 22:50:10 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _ASN1_H
diff --git a/src/pluto/ca.c b/src/pluto/ca.c
index 528531447..d2f9a47c2 100644
--- a/src/pluto/ca.c
+++ b/src/pluto/ca.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ca.c,v 1.10 2005/12/25 12:29:55 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/ca.h b/src/pluto/ca.h
index eaeede8f1..9cfa35b87 100644
--- a/src/pluto/ca.h
+++ b/src/pluto/ca.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ca.h,v 1.5 2005/12/25 12:28:40 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _CA_H
diff --git a/src/pluto/certs.c b/src/pluto/certs.c
index 779646a98..92cad9cb9 100644
--- a/src/pluto/certs.c
+++ b/src/pluto/certs.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: certs.c,v 1.8 2005/11/06 22:55:41 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/certs.h b/src/pluto/certs.h
index ca5acd35a..7aee9c927 100644
--- a/src/pluto/certs.h
+++ b/src/pluto/certs.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: certs.h,v 1.7 2005/11/06 22:55:41 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _CERTS_H
diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index 40bdcd82b..8350c682b 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: connections.c,v 1.43 2006/04/29 18:16:02 as Exp $
+ * RCSID $Id$
  */
 
 #include <string.h>
diff --git a/src/pluto/connections.h b/src/pluto/connections.h
index 40cbfc497..a140b85f2 100644
--- a/src/pluto/connections.h
+++ b/src/pluto/connections.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: connections.h,v 1.18 2006/04/22 21:59:20 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _CONNECTIONS_H
diff --git a/src/pluto/constants.c b/src/pluto/constants.c
index b792b4f74..8315b5902 100644
--- a/src/pluto/constants.c
+++ b/src/pluto/constants.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: constants.c,v 1.21 2006/03/27 07:38:59 as Exp $
+ * RCSID $Id$
  */
 
 /*
diff --git a/src/pluto/constants.h b/src/pluto/constants.h
index a4f5ba1eb..012b940ff 100644
--- a/src/pluto/constants.h
+++ b/src/pluto/constants.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: constants.h,v 1.20 2006/02/28 19:13:33 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _CONSTANTS_H
diff --git a/src/pluto/cookie.c b/src/pluto/cookie.c
index 458120e46..31d1f69cd 100644
--- a/src/pluto/cookie.c
+++ b/src/pluto/cookie.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: cookie.c,v 1.2 2005/08/17 16:38:20 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/cookie.h b/src/pluto/cookie.h
index f5b0e64d1..9b8fb7ce3 100644
--- a/src/pluto/cookie.h
+++ b/src/pluto/cookie.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: cookie.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #include <freeswan.h>
diff --git a/src/pluto/crl.c b/src/pluto/crl.c
index bb4105120..080d501ca 100644
--- a/src/pluto/crl.c
+++ b/src/pluto/crl.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: crl.c,v 1.12 2005/12/06 22:49:57 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/crl.h b/src/pluto/crl.h
index 328539770..adca2ffae 100644
--- a/src/pluto/crl.h
+++ b/src/pluto/crl.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: crl.h,v 1.4 2005/07/18 19:36:22 as Exp $
+ * RCSID $Id$
  */
 
 #include "constants.h"
diff --git a/src/pluto/crypto.c b/src/pluto/crypto.c
index f1b7c3f5f..caea0de81 100644
--- a/src/pluto/crypto.c
+++ b/src/pluto/crypto.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: crypto.c,v 1.5 2005/12/06 22:51:34 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/crypto.h b/src/pluto/crypto.h
index 48c983349..2a50c95c5 100644
--- a/src/pluto/crypto.h
+++ b/src/pluto/crypto.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: crypto.h,v 1.6 2005/04/07 20:13:30 as Exp $
+ * RCSID $Id$
  */
 
 #include <gmp.h>    /* GNU MP library */
diff --git a/src/pluto/db_ops.c b/src/pluto/db_ops.c
index bbcd7918f..c27fb4744 100644
--- a/src/pluto/db_ops.c
+++ b/src/pluto/db_ops.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: db_ops.c,v 1.4 2005/04/07 20:13:44 as Exp $
+ * RCSID $Id$
  */
 
 /* 
diff --git a/src/pluto/db_ops.h b/src/pluto/db_ops.h
index 433e75280..5df5ac313 100644
--- a/src/pluto/db_ops.h
+++ b/src/pluto/db_ops.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: db_ops.h,v 1.3 2004/09/17 12:37:37 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _DB_OPS_H
diff --git a/src/pluto/defs.c b/src/pluto/defs.c
index 9ae32a480..5864099d3 100644
--- a/src/pluto/defs.c
+++ b/src/pluto/defs.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: defs.c,v 1.9 2006/01/04 21:00:43 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/defs.h b/src/pluto/defs.h
index 3bfb29a22..44e012665 100644
--- a/src/pluto/defs.h
+++ b/src/pluto/defs.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: defs.h,v 1.10 2006/01/04 21:00:43 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _DEFS_H
diff --git a/src/pluto/demux.c b/src/pluto/demux.c
index 8941c78c8..912ab3a73 100644
--- a/src/pluto/demux.c
+++ b/src/pluto/demux.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: demux.c,v 1.14 2006/06/22 11:58:25 as Exp $
+ * RCSID $Id$
  */
 
 /* Ordering Constraints on Payloads
diff --git a/src/pluto/demux.h b/src/pluto/demux.h
index 373dd6315..a012b2d80 100644
--- a/src/pluto/demux.h
+++ b/src/pluto/demux.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: demux.h,v 1.4 2004/07/22 22:57:25 as Exp $
+ * RCSID $Id$
  */
 
 #include "packet.h"
diff --git a/src/pluto/dnskey.c b/src/pluto/dnskey.c
index 23863b0a2..3472d1ee0 100644
--- a/src/pluto/dnskey.c
+++ b/src/pluto/dnskey.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: dnskey.c,v 1.5 2005/09/08 16:26:30 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/dnskey.h b/src/pluto/dnskey.h
index 0b9f0ee33..bb6448ee1 100644
--- a/src/pluto/dnskey.h
+++ b/src/pluto/dnskey.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: dnskey.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 extern int
diff --git a/src/pluto/fetch.c b/src/pluto/fetch.c
index 8f48152f6..069ef2966 100644
--- a/src/pluto/fetch.c
+++ b/src/pluto/fetch.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: fetch.c,v 1.12 2006/05/16 14:19:27 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/fetch.h b/src/pluto/fetch.h
index 6303f37e4..64908deda 100644
--- a/src/pluto/fetch.h
+++ b/src/pluto/fetch.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: fetch.h,v 1.6 2005/11/25 10:08:00 as Exp $
+ * RCSID $Id$
  */
 
 #include "x509.h"
diff --git a/src/pluto/foodgroups.c b/src/pluto/foodgroups.c
index c92bdb3d4..b4a81546e 100644
--- a/src/pluto/foodgroups.c
+++ b/src/pluto/foodgroups.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: foodgroups.c,v 1.2 2004/04/01 18:28:32 as Exp $
+ * RCSID $Id$
  */
 
 #include <string.h>
diff --git a/src/pluto/foodgroups.h b/src/pluto/foodgroups.h
index 7cbbccc44..9093c0662 100644
--- a/src/pluto/foodgroups.h
+++ b/src/pluto/foodgroups.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: foodgroups.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 struct connection;	/* forward declaration */
diff --git a/src/pluto/gcryptfix.c b/src/pluto/gcryptfix.c
index 1ebacdcf6..0c46e575e 100644
--- a/src/pluto/gcryptfix.c
+++ b/src/pluto/gcryptfix.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: gcryptfix.c,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/gcryptfix.h b/src/pluto/gcryptfix.h
index 637ecbc8d..0bcd64b15 100644
--- a/src/pluto/gcryptfix.h
+++ b/src/pluto/gcryptfix.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: gcryptfix.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #define DBG_CIPHER  1	/* some day we'll do this right */
diff --git a/src/pluto/id.c b/src/pluto/id.c
index 4e75ec2e9..6c27baac0 100644
--- a/src/pluto/id.c
+++ b/src/pluto/id.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: id.c,v 1.4 2005/08/15 20:07:08 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/id.h b/src/pluto/id.h
index 4fe9ef227..02fb23f96 100644
--- a/src/pluto/id.h
+++ b/src/pluto/id.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: id.h,v 1.5 2005/08/15 20:07:08 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _ID_H
diff --git a/src/pluto/ike_alg.c b/src/pluto/ike_alg.c
index 1c6514b4b..69b487f91 100644
--- a/src/pluto/ike_alg.c
+++ b/src/pluto/ike_alg.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ike_alg.c,v 1.6 2004/09/17 21:29:50 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/ike_alg.h b/src/pluto/ike_alg.h
index 19e2e591c..41695e8de 100644
--- a/src/pluto/ike_alg.h
+++ b/src/pluto/ike_alg.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ike_alg.h,v 1.3 2004/09/16 23:22:22 as Exp $
+ * RCSID $Id$
  */
  
 #ifndef _IKE_ALG_H
diff --git a/src/pluto/ipsec_doi.c b/src/pluto/ipsec_doi.c
index 14aec4495..c564de6b9 100644
--- a/src/pluto/ipsec_doi.c
+++ b/src/pluto/ipsec_doi.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ipsec_doi.c,v 1.39 2006/04/22 21:59:20 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/ipsec_doi.h b/src/pluto/ipsec_doi.h
index 80b12c31d..a05f44291 100644
--- a/src/pluto/ipsec_doi.h
+++ b/src/pluto/ipsec_doi.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ipsec_doi.h,v 1.3 2005/01/06 22:10:44 as Exp $
+ * RCSID $Id$
  */
 
 extern void echo_hdr(struct msg_digest *md, bool enc, u_int8_t np);
diff --git a/src/pluto/kernel.c b/src/pluto/kernel.c
index 663fa7230..1b74ad697 100644
--- a/src/pluto/kernel.c
+++ b/src/pluto/kernel.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel.c,v 1.26 2006/04/29 18:16:02 as Exp $
+ * RCSID $Id$
  */
 
 #include <stddef.h>
diff --git a/src/pluto/kernel.h b/src/pluto/kernel.h
index e7ff08c7b..c2333fac8 100644
--- a/src/pluto/kernel.h
+++ b/src/pluto/kernel.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel.h,v 1.10 2006/03/08 22:12:37 as Exp $
+ * RCSID $Id$
  */
 
 #include "connections.h"
diff --git a/src/pluto/kernel_alg.c b/src/pluto/kernel_alg.c
index 91dfaff59..2918e9cf1 100644
--- a/src/pluto/kernel_alg.c
+++ b/src/pluto/kernel_alg.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_alg.c,v 1.9 2005/08/17 16:31:24 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/kernel_alg.h b/src/pluto/kernel_alg.h
index 483e97da1..7b6cdab75 100644
--- a/src/pluto/kernel_alg.h
+++ b/src/pluto/kernel_alg.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_alg.h,v 1.5 2005/08/17 16:31:24 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _KERNEL_ALG_H
diff --git a/src/pluto/kernel_netlink.c b/src/pluto/kernel_netlink.c
index 9b9d7b9ed..c9be3e60c 100644
--- a/src/pluto/kernel_netlink.c
+++ b/src/pluto/kernel_netlink.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_netlink.c,v 1.24 2006/03/10 14:49:43 as Exp $
+ * RCSID $Id$
  */
 
 #if defined(linux) && defined(KERNEL26_SUPPORT)
diff --git a/src/pluto/kernel_netlink.h b/src/pluto/kernel_netlink.h
index 1b5f42e48..4ec65d5ed 100644
--- a/src/pluto/kernel_netlink.h
+++ b/src/pluto/kernel_netlink.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_netlink.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #if defined(KLIPS) && defined(linux)
diff --git a/src/pluto/kernel_noklips.c b/src/pluto/kernel_noklips.c
index 570bb0470..7ded9faf8 100644
--- a/src/pluto/kernel_noklips.c
+++ b/src/pluto/kernel_noklips.c
@@ -14,7 +14,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_noklips.c,v 1.5 2006/02/04 00:01:22 as Exp $
+ * RCSID $Id$
  */
 
 #include <errno.h>
diff --git a/src/pluto/kernel_noklips.h b/src/pluto/kernel_noklips.h
index fe4e77ec4..df4d46f54 100644
--- a/src/pluto/kernel_noklips.h
+++ b/src/pluto/kernel_noklips.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_noklips.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 extern void init_noklips(void);
diff --git a/src/pluto/kernel_pfkey.c b/src/pluto/kernel_pfkey.c
index ced7a1453..b047d32d9 100644
--- a/src/pluto/kernel_pfkey.c
+++ b/src/pluto/kernel_pfkey.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_pfkey.c,v 1.8 2006/02/04 00:01:22 as Exp $
+ * RCSID $Id$
  */
 
 #ifdef KLIPS
diff --git a/src/pluto/kernel_pfkey.h b/src/pluto/kernel_pfkey.h
index 9dbcdd341..5546acc5e 100644
--- a/src/pluto/kernel_pfkey.h
+++ b/src/pluto/kernel_pfkey.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: kernel_pfkey.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #ifdef KLIPS
diff --git a/src/pluto/keys.c b/src/pluto/keys.c
index 144b72256..edda8add0 100644
--- a/src/pluto/keys.c
+++ b/src/pluto/keys.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: keys.c,v 1.24 2006/01/27 08:59:40 as Exp $
+ * RCSID $Id$
  */
 
 #include <stddef.h>
diff --git a/src/pluto/keys.h b/src/pluto/keys.h
index 415bdc3c1..6ee4560a1 100644
--- a/src/pluto/keys.h
+++ b/src/pluto/keys.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: keys.h,v 1.7 2006/01/26 20:10:34 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _KEYS_H
diff --git a/src/pluto/lex.c b/src/pluto/lex.c
index 5c811725a..31abea498 100644
--- a/src/pluto/lex.c
+++ b/src/pluto/lex.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: lex.c,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/lex.h b/src/pluto/lex.h
index fb6c15236..297672965 100644
--- a/src/pluto/lex.h
+++ b/src/pluto/lex.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: lex.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 #define MAX_TOK_LEN 2048    /* includes terminal '\0' */
diff --git a/src/pluto/log.c b/src/pluto/log.c
index 36997122c..6dfc5d8c9 100644
--- a/src/pluto/log.c
+++ b/src/pluto/log.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: log.c,v 1.8 2006/04/29 18:16:02 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/log.h b/src/pluto/log.h
index a4eae9d1c..680c4aa87 100644
--- a/src/pluto/log.h
+++ b/src/pluto/log.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: log.h,v 1.4 2005/07/11 18:33:45 as Exp $
+ * RCSID $Id$
  */
 
 #include <freeswan.h>
diff --git a/src/pluto/modecfg.c b/src/pluto/modecfg.c
index cda6007c7..04f13fab3 100644
--- a/src/pluto/modecfg.c
+++ b/src/pluto/modecfg.c
@@ -14,7 +14,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: modecfg.c,v 1.6 2006/04/24 20:44:57 as Exp $
+ * RCSID $Id$
  *
  * This code originally written by Colubris Networks, Inc.
  * Extraction of patch and porting to 1.99 codebases by Xelerance Corporation
diff --git a/src/pluto/modecfg.h b/src/pluto/modecfg.h
index 68b7ef446..7b4d5820d 100644
--- a/src/pluto/modecfg.h
+++ b/src/pluto/modecfg.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: modecfg.h,v 1.1 2005/01/06 22:10:15 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _MODECFG_H
diff --git a/src/pluto/mp_defs.c b/src/pluto/mp_defs.c
index 7ad896751..9ba4e4f5a 100644
--- a/src/pluto/mp_defs.c
+++ b/src/pluto/mp_defs.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: mp_defs.c,v 1.1 2006/01/05 12:37:11 as Exp $
+ * RCSID $Id$
  */
 
 #include <freeswan.h>
diff --git a/src/pluto/mp_defs.h b/src/pluto/mp_defs.h
index 744a028d1..85a766e25 100644
--- a/src/pluto/mp_defs.h
+++ b/src/pluto/mp_defs.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: mp_defs.h,v 1.2 2006/01/06 11:40:45 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _MP_DEFS_H
diff --git a/src/pluto/nat_traversal.c b/src/pluto/nat_traversal.c
index 4a52cc107..5566d3d25 100644
--- a/src/pluto/nat_traversal.c
+++ b/src/pluto/nat_traversal.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: nat_traversal.c,v 1.8 2005/01/06 22:36:58 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/nat_traversal.h b/src/pluto/nat_traversal.h
index 71222c54c..0ce1d49aa 100644
--- a/src/pluto/nat_traversal.h
+++ b/src/pluto/nat_traversal.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: nat_traversal.h,v 1.4 2004/07/27 21:11:30 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _NAT_TRAVERSAL_H
diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c
index 5f7b1afeb..02e40b56e 100644
--- a/src/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
@@ -12,6 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
+ * $Id$
  */
 
 #include <unistd.h>
diff --git a/src/pluto/ocsp.h b/src/pluto/ocsp.h
index 49e1026ec..f405afcea 100644
--- a/src/pluto/ocsp.h
+++ b/src/pluto/ocsp.h
@@ -12,6 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
+ * $Id$
  */
 
 #include "constants.h"
diff --git a/src/pluto/packet.c b/src/pluto/packet.c
index 9f04c8bb2..2ebccbdf4 100644
--- a/src/pluto/packet.c
+++ b/src/pluto/packet.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: packet.c,v 1.7 2005/01/06 22:39:04 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/packet.h b/src/pluto/packet.h
index 676a5e6cd..a515d3890 100644
--- a/src/pluto/packet.h
+++ b/src/pluto/packet.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: packet.h,v 1.5 2005/01/06 22:10:15 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _PACKET_H
diff --git a/src/pluto/pem.c b/src/pluto/pem.c
index db6d0d7e3..14792d49f 100644
--- a/src/pluto/pem.c
+++ b/src/pluto/pem.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pem.c,v 1.4 2005/08/17 16:31:24 as Exp $
+ * RCSID $Id$
  */
 
 /* decrypt a PEM encoded data block using DES-EDE3-CBC
diff --git a/src/pluto/pem.h b/src/pluto/pem.h
index 815b5d85b..b87b922e2 100644
--- a/src/pluto/pem.h
+++ b/src/pluto/pem.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pem.h,v 1.1 2004/03/15 20:35:28 as Exp $
+ * RCSID $Id$
  */
 
 extern err_t pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label
diff --git a/src/pluto/pgp.c b/src/pluto/pgp.c
index 307303f6b..aab9bff67 100644
--- a/src/pluto/pgp.c
+++ b/src/pluto/pgp.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pgp.c,v 1.7 2006/01/04 21:00:43 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/pgp.h b/src/pluto/pgp.h
index 4f34debc9..6d717fa4d 100644
--- a/src/pluto/pgp.h
+++ b/src/pluto/pgp.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pgp.h,v 1.3 2005/08/07 07:50:09 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _PGP_H
diff --git a/src/pluto/pkcs1.c b/src/pluto/pkcs1.c
index 74515ad89..f02dc29df 100644
--- a/src/pluto/pkcs1.c
+++ b/src/pluto/pkcs1.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pkcs1.c,v 1.17 2006/01/04 21:00:43 as Exp $
+ * RCSID $Id$
  */
 
 #include <stddef.h>
diff --git a/src/pluto/pkcs1.h b/src/pluto/pkcs1.h
index c927db0f8..76f45a6b5 100644
--- a/src/pluto/pkcs1.h
+++ b/src/pluto/pkcs1.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pkcs1.h,v 1.14 2005/12/06 22:52:12 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _PKCS1_H
diff --git a/src/pluto/pkcs7.c b/src/pluto/pkcs7.c
index e36f07379..2889489f3 100644
--- a/src/pluto/pkcs7.c
+++ b/src/pluto/pkcs7.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pkcs7.c,v 1.13 2005/12/22 22:11:24 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/pkcs7.h b/src/pluto/pkcs7.h
index 38c633f4e..56a6389af 100644
--- a/src/pluto/pkcs7.h
+++ b/src/pluto/pkcs7.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: pkcs7.h,v 1.10 2005/12/22 22:11:24 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _PKCS7_H
diff --git a/src/pluto/rcv_whack.c b/src/pluto/rcv_whack.c
index 6a39e7c1f..f8f672395 100644
--- a/src/pluto/rcv_whack.c
+++ b/src/pluto/rcv_whack.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: rcv_whack.c,v 1.18 2006/05/25 11:33:57 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/rcv_whack.h b/src/pluto/rcv_whack.h
index f42761c51..bc18392d6 100644
--- a/src/pluto/rcv_whack.h
+++ b/src/pluto/rcv_whack.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: rcv_whack.h,v 1.1 2004/03/15 20:35:29 as Exp $
+ * RCSID $Id$
  */
 
 extern void whack_handle(int kernelfd);
diff --git a/src/pluto/rnd.c b/src/pluto/rnd.c
index 812882c6b..eb1cbabc9 100644
--- a/src/pluto/rnd.c
+++ b/src/pluto/rnd.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: rnd.c,v 1.3 2005/09/08 16:26:30 as Exp $
+ * RCSID $Id$
  */
 
 /* A true random number generator (we hope)
diff --git a/src/pluto/rnd.h b/src/pluto/rnd.h
index 0bd168039..2c3a2f8dc 100644
--- a/src/pluto/rnd.h
+++ b/src/pluto/rnd.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: rnd.h,v 1.1 2004/03/15 20:35:29 as Exp $
+ * RCSID $Id$
  */
 
 extern u_char    secret_of_the_day[SHA1_DIGEST_SIZE];
diff --git a/src/pluto/server.c b/src/pluto/server.c
index 1cc221515..c14f72698 100644
--- a/src/pluto/server.c
+++ b/src/pluto/server.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: server.c,v 1.9 2005/09/09 14:15:35 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/server.h b/src/pluto/server.h
index d90e47c8f..6bca0f6b8 100644
--- a/src/pluto/server.h
+++ b/src/pluto/server.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: server.h,v 1.2 2004/03/22 21:53:20 as Exp $
+ * RCSID $Id$
  */
 
 extern int ctl_fd;	/* file descriptor of control (whack) socket */
diff --git a/src/pluto/smartcard.c b/src/pluto/smartcard.c
index 1261d6dd4..3e93c79ab 100644
--- a/src/pluto/smartcard.c
+++ b/src/pluto/smartcard.c
@@ -18,7 +18,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: smartcard.c,v 1.41 2006/01/04 21:03:52 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/smartcard.h b/src/pluto/smartcard.h
index 864f630a1..289eb245b 100644
--- a/src/pluto/smartcard.h
+++ b/src/pluto/smartcard.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: smartcard.h,v 1.14 2005/11/06 22:55:41 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _SMARTCARD_H
diff --git a/src/pluto/spdb.c b/src/pluto/spdb.c
index e3fc8177d..699ab4eff 100644
--- a/src/pluto/spdb.c
+++ b/src/pluto/spdb.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: spdb.c,v 1.9 2006/04/22 21:59:20 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/spdb.h b/src/pluto/spdb.h
index 0df488841..086b364c2 100644
--- a/src/pluto/spdb.h
+++ b/src/pluto/spdb.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: spdb.h,v 1.4 2006/04/22 21:59:20 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _SPDB_H
diff --git a/src/pluto/state.c b/src/pluto/state.c
index 80c3156b1..273038f89 100644
--- a/src/pluto/state.c
+++ b/src/pluto/state.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: state.c,v 1.13 2006/04/29 18:16:02 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/state.h b/src/pluto/state.h
index d3a980564..6ecfb541b 100644
--- a/src/pluto/state.h
+++ b/src/pluto/state.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: state.h,v 1.11 2006/03/08 22:12:37 as Exp $
+ * RCSID $Id$
  */
 
 #include <sys/types.h>
diff --git a/src/pluto/timer.c b/src/pluto/timer.c
index 9d3f90ce3..472fd5cf2 100644
--- a/src/pluto/timer.c
+++ b/src/pluto/timer.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: timer.c,v 1.5 2004/09/17 21:36:57 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdio.h>
diff --git a/src/pluto/timer.h b/src/pluto/timer.h
index 92464192c..f8337c843 100644
--- a/src/pluto/timer.h
+++ b/src/pluto/timer.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: timer.h,v 1.2 2004/07/29 18:33:45 as Exp $
+ * RCSID $Id$
  */
 
 extern time_t now(void);	/* careful version of time(2) */
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index 6ea0c3d3c..324cda73a 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.c,v 1.35 2006/04/12 16:44:28 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 6402c5f1c..20cb9b46d 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.h,v 1.30 2006/04/12 16:44:28 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _VENDOR_H_
diff --git a/src/pluto/virtual.c b/src/pluto/virtual.c
index d1553364e..cf036cc7b 100644
--- a/src/pluto/virtual.c
+++ b/src/pluto/virtual.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: virtual.c,v 1.4 2004/04/02 10:38:52 as Exp $
+ * RCSID $Id$
  */
 
 #include <freeswan.h>
diff --git a/src/pluto/virtual.h b/src/pluto/virtual.h
index 2d5bf27ae..ef30977ae 100644
--- a/src/pluto/virtual.h
+++ b/src/pluto/virtual.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: virtual.h,v 1.2 2004/03/22 21:53:20 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _VIRTUAL_IP_H
diff --git a/src/pluto/x509.c b/src/pluto/x509.c
index 041eb1505..3c6d85f07 100644
--- a/src/pluto/x509.c
+++ b/src/pluto/x509.c
@@ -14,7 +14,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: x509.c,v 1.36 2006/04/10 16:08:33 as Exp $
+ * RCSID $Id$
  */
 
 #include <stdlib.h>
diff --git a/src/pluto/x509.h b/src/pluto/x509.h
index d15b3da53..c200d4f34 100644
--- a/src/pluto/x509.h
+++ b/src/pluto/x509.h
@@ -14,7 +14,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: x509.h,v 1.10 2005/12/06 22:52:44 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _X509_H
diff --git a/src/pluto/xauth.c b/src/pluto/xauth.c
index 77ac8dee7..4c82a37d5 100644
--- a/src/pluto/xauth.c
+++ b/src/pluto/xauth.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: xauth.c,v 1.1 2005/01/06 22:10:15 as Exp $
+ * RCSID $Id$
  */
 
 #include <dlfcn.h>
diff --git a/src/pluto/xauth.h b/src/pluto/xauth.h
index 740618750..b36f291b0 100644
--- a/src/pluto/xauth.h
+++ b/src/pluto/xauth.h
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: xauth.h,v 1.1 2005/01/06 22:10:15 as Exp $
+ * RCSID $Id$
  */
 
 #ifndef _XAUTH_H