87 files changed, 78 insertions, 86 deletions
diff --git a/sbin/Makefile b/sbin/Makefile
index 890ff9793f7..2a26e1a44df 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,12 +1,13 @@
-#	$OpenBSD: Makefile,v 1.33 1998/09/11 11:56:07 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.34 1998/11/14 23:36:56 deraadt Exp $
 
 # Not ported: XNSrouted enpload scsiformat startslip
 # Missing: icheck
 
-SUBDIR=	badsect disklabel ccdconfig dmesg fsck ifconfig init ipf ipfstat \
-	ipnat ipsec kbd mknod modload modunload mount mountd ncheck_ffs nfsd \
-	nfsiod nologin ping quotacheck reboot route routed savecore scan_ffs \
-	scsi shutdown slattach swapon ttyflags umount
+SUBDIR= badsect ccdconfig disklabel dmesg fsck ifconfig init ipf ipfstat \
+	ipnat ipsecadm kbd mknod modload modunload mount mountd ncheck_ffs
+	nfsd nfsiod nologin photurisd ping quotacheck reboot route routed \
+	savecore scan_ffs scsi shutdown slattach startkey swapon ttyflags \
+	umount
 
 # support for various file systems
 SUBDIR+= mount_ados
diff --git a/sbin/ipsec/Makefile b/sbin/ipsec/Makefile
deleted file mode 100644
index f700db11f0a..00000000000
--- a/sbin/ipsec/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 1998/05/24 13:53:21 provos Exp $
-
-SUBDIR=	ipsecadm photurisd startkey
-
-.include <bsd.subdir.mk>
diff --git a/sbin/ipsec/Makefile.inc b/sbin/ipsec/Makefile.inc
deleted file mode 100644
index 9d7e9164ce1..00000000000
--- a/sbin/ipsec/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1997/07/20 10:32:41 provos Exp $
-
-BINDIR=	/sbin
-LDSTATIC=	${STATIC}
diff --git a/sbin/ipsec/ipsecadm/Makefile b/sbin/ipsecadm/Makefile
index 32591c7c004..734515dd7cb 100644
--- a/sbin/ipsec/ipsecadm/Makefile
+++ b/sbin/ipsecadm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1998/05/24 13:28:58 provos Exp $
+#	$OpenBSD: Makefile,v 1.1 1998/11/14 23:37:20 deraadt Exp $
 
 PROG= ipsecadm
 SRCS= ipsecadm.c kernel.c xf_esp_new.c xf_esp_old.c xf_ah_old.c xf_ah_new.c \
diff --git a/sbin/ipsec/ipsecadm/ipsecadm.1 b/sbin/ipsecadm/ipsecadm.1
index 8ef100b7b7c..bfcf324712e 100644
--- a/sbin/ipsec/ipsecadm/ipsecadm.1
+++ b/sbin/ipsecadm/ipsecadm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsecadm.1,v 1.18 1998/11/11 22:19:57 aaron Exp $
+.\" $OpenBSD: ipsecadm.1,v 1.1 1998/11/14 23:37:20 deraadt Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
diff --git a/sbin/ipsec/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c
index 33d6e791523..fbe86095392 100644
--- a/sbin/ipsec/ipsecadm/ipsecadm.c
+++ b/sbin/ipsecadm/ipsecadm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsecadm.c,v 1.20 1998/08/01 06:19:27 angelos Exp $ */
+/* $OpenBSD: ipsecadm.c,v 1.1 1998/11/14 23:37:20 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/kernel.c b/sbin/ipsecadm/kernel.c
index b6b3a07c530..d17592ad4d4 100644
--- a/sbin/ipsec/ipsecadm/kernel.c
+++ b/sbin/ipsecadm/kernel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernel.c,v 1.4 1998/08/01 06:23:48 angelos Exp $ */
+/* $OpenBSD: kernel.c,v 1.1 1998/11/14 23:37:20 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_ah_new.c b/sbin/ipsecadm/xf_ah_new.c
index 1046eaef491..bb1cbcc7571 100644
--- a/sbin/ipsec/ipsecadm/xf_ah_new.c
+++ b/sbin/ipsecadm/xf_ah_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_ah_new.c,v 1.3 1998/05/24 13:29:03 provos Exp $ */
+/* $OpenBSD: xf_ah_new.c,v 1.1 1998/11/14 23:37:20 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_ah_old.c b/sbin/ipsecadm/xf_ah_old.c
index f82ac8bc202..9185b50e9a3 100644
--- a/sbin/ipsec/ipsecadm/xf_ah_old.c
+++ b/sbin/ipsecadm/xf_ah_old.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_ah_old.c,v 1.3 1998/05/24 13:29:04 provos Exp $ */
+/* $OpenBSD: xf_ah_old.c,v 1.1 1998/11/14 23:37:20 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_delspi.c b/sbin/ipsecadm/xf_delspi.c
index 3d352d8131d..d98be70348f 100644
--- a/sbin/ipsec/ipsecadm/xf_delspi.c
+++ b/sbin/ipsecadm/xf_delspi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_delspi.c,v 1.6 1998/05/24 13:29:06 provos Exp $ */
+/* $OpenBSD: xf_delspi.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_esp_new.c b/sbin/ipsecadm/xf_esp_new.c
index adda7f02dd0..5b8250f2af5 100644
--- a/sbin/ipsec/ipsecadm/xf_esp_new.c
+++ b/sbin/ipsecadm/xf_esp_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_esp_new.c,v 1.7 1998/05/24 13:29:07 provos Exp $ */
+/* $OpenBSD: xf_esp_new.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_esp_old.c b/sbin/ipsecadm/xf_esp_old.c
index f7d7acd0deb..da1ac77de9d 100644
--- a/sbin/ipsec/ipsecadm/xf_esp_old.c
+++ b/sbin/ipsecadm/xf_esp_old.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_esp_old.c,v 1.3 1998/05/24 13:29:08 provos Exp $ */
+/* $OpenBSD: xf_esp_old.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_flow.c b/sbin/ipsecadm/xf_flow.c
index 7e97ee55feb..9f66b27a7d0 100644
--- a/sbin/ipsec/ipsecadm/xf_flow.c
+++ b/sbin/ipsecadm/xf_flow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xf_flow.c,v 1.4 1998/06/08 17:42:34 provos Exp $	*/
+/*	$OpenBSD: xf_flow.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_grp.c b/sbin/ipsecadm/xf_grp.c
index 7ccf0eed1d9..25e997a5003 100644
--- a/sbin/ipsec/ipsecadm/xf_grp.c
+++ b/sbin/ipsecadm/xf_grp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_grp.c,v 1.9 1998/05/24 13:29:10 provos Exp $ */
+/* $OpenBSD: xf_grp.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/ipsecadm/xf_ip4.c b/sbin/ipsecadm/xf_ip4.c
index b322e2fc38e..8a2d073a76f 100644
--- a/sbin/ipsec/ipsecadm/xf_ip4.c
+++ b/sbin/ipsecadm/xf_ip4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xf_ip4.c,v 1.6 1998/07/29 21:02:55 angelos Exp $ */
+/* $OpenBSD: xf_ip4.c,v 1.1 1998/11/14 23:37:21 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
diff --git a/sbin/ipsec/photurisd/INSTALL b/sbin/photurisd/INSTALL
index a43abf7b6c8..a43abf7b6c8 100644
--- a/sbin/ipsec/photurisd/INSTALL
+++ b/sbin/photurisd/INSTALL
diff --git a/sbin/ipsec/photurisd/Makefile b/sbin/photurisd/Makefile
index 86f525dfa07..86f525dfa07 100644
--- a/sbin/ipsec/photurisd/Makefile
+++ b/sbin/photurisd/Makefile
diff --git a/sbin/ipsec/photurisd/README b/sbin/photurisd/README
index 59f7880e55e..59f7880e55e 100644
--- a/sbin/ipsec/photurisd/README
+++ b/sbin/photurisd/README
diff --git a/sbin/ipsec/photurisd/README.howtouse b/sbin/photurisd/README.howtouse
index 49c0c819741..49c0c819741 100644
--- a/sbin/ipsec/photurisd/README.howtouse
+++ b/sbin/photurisd/README.howtouse
diff --git a/sbin/ipsec/photurisd/api.c b/sbin/photurisd/api.c
index b60382d6c78..17cf1f7db97 100644
--- a/sbin/ipsec/photurisd/api.c
+++ b/sbin/photurisd/api.c
@@ -37,7 +37,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: api.c,v 1.4 1998/03/04 11:43:07 provos Exp $";
+static char rcsid[] = "$Id: api.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $";
 #endif
 
 #define _API_C_
diff --git a/sbin/ipsec/photurisd/api.h b/sbin/photurisd/api.h
index 029585182fa..029585182fa 100644
--- a/sbin/ipsec/photurisd/api.h
+++ b/sbin/photurisd/api.h
diff --git a/sbin/ipsec/photurisd/attributes.c b/sbin/photurisd/attributes.c
index 608aa1a310a..c66cf815994 100644
--- a/sbin/ipsec/photurisd/attributes.c
+++ b/sbin/photurisd/attributes.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: attributes.c,v 1.4 1998/06/30 16:58:47 provos Exp $";
+static char rcsid[] = "$Id: attributes.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $";
 #endif
 
 #define _ATTRIBUTES_C_
diff --git a/sbin/ipsec/photurisd/attributes.h b/sbin/photurisd/attributes.h
index ccfdea8701a..ccfdea8701a 100644
--- a/sbin/ipsec/photurisd/attributes.h
+++ b/sbin/photurisd/attributes.h
diff --git a/sbin/ipsec/photurisd/buffer.c b/sbin/photurisd/buffer.c
index afc3a22d383..70ef2b21cc9 100644
--- a/sbin/ipsec/photurisd/buffer.c
+++ b/sbin/photurisd/buffer.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: buffer.c,v 1.2 1998/03/04 11:43:11 provos Exp $";
+static char rcsid[] = "$Id: buffer.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/sbin/ipsec/photurisd/buffer.h b/sbin/photurisd/buffer.h
index e208582b353..8492221abaf 100644
--- a/sbin/ipsec/photurisd/buffer.h
+++ b/sbin/photurisd/buffer.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: buffer.h,v 1.2 1998/03/04 11:43:12 provos Exp $ */
+/* $Id: buffer.h,v 1.1 1998/11/14 23:37:22 deraadt Exp $ */
 /*
  * buffer.h: 
  * variables with buffers.
diff --git a/sbin/ipsec/photurisd/compute_secrets.c b/sbin/photurisd/compute_secrets.c
index a32f0855232..59b964b4d34 100644
--- a/sbin/ipsec/photurisd/compute_secrets.c
+++ b/sbin/photurisd/compute_secrets.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint 
-static char rcsid[] = "$Id: compute_secrets.c,v 1.6 1998/06/30 16:58:45 provos Exp $"; 
+static char rcsid[] = "$Id: compute_secrets.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $"; 
 #endif 
 
 #define _SECRETS_C_
diff --git a/sbin/ipsec/photurisd/config.c b/sbin/photurisd/config.c
index 0594770abfa..71d1ee33246 100644
--- a/sbin/ipsec/photurisd/config.c
+++ b/sbin/photurisd/config.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: config.c,v 1.11 1998/08/17 22:12:44 provos Exp $";
+static char rcsid[] = "$Id: config.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $";
 #endif
 
 #define _CONFIG_C_
diff --git a/sbin/ipsec/photurisd/config.h b/sbin/photurisd/config.h
index 6f0dbfe8244..8eb1cc493e5 100644
--- a/sbin/ipsec/photurisd/config.h
+++ b/sbin/photurisd/config.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: config.h,v 1.4 1998/03/04 11:43:17 provos Exp $ */
+/* $Id: config.h,v 1.1 1998/11/14 23:37:22 deraadt Exp $ */
 /*
  * config.h: 
  * handling config
diff --git a/sbin/ipsec/photurisd/cookie.c b/sbin/photurisd/cookie.c
index b1392431d7a..8092886356d 100644
--- a/sbin/ipsec/photurisd/cookie.c
+++ b/sbin/photurisd/cookie.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: cookie.c,v 1.2 1997/07/24 23:47:10 provos Exp $";
+static char rcsid[] = "$Id: cookie.c,v 1.1 1998/11/14 23:37:22 deraadt Exp $";
 #endif
 
 #define _COOKIE_C_
diff --git a/sbin/ipsec/photurisd/cookie.h b/sbin/photurisd/cookie.h
index 8d9d8df83dc..34af421b0c5 100644
--- a/sbin/ipsec/photurisd/cookie.h
+++ b/sbin/photurisd/cookie.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: cookie.h,v 1.2 1997/07/24 23:47:11 provos Exp $ */
+/* $Id: cookie.h,v 1.1 1998/11/14 23:37:22 deraadt Exp $ */
 /* 
  * cookie.h: 
  * cookie generation header file
diff --git a/sbin/ipsec/photurisd/encrypt.h b/sbin/photurisd/encrypt.h
index 5da050a1a8e..3d90356cc73 100644
--- a/sbin/ipsec/photurisd/encrypt.h
+++ b/sbin/photurisd/encrypt.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: encrypt.h,v 1.2 1998/03/04 11:43:18 provos Exp $ */
+/* $Id: encrypt.h,v 1.1 1998/11/14 23:37:23 deraadt Exp $ */
 /*
  * encrypt.h:
  * prototypes for photuris_packet_encrypt.c
diff --git a/sbin/ipsec/photurisd/errlog.c b/sbin/photurisd/errlog.c
index 70d02e24ec3..0fc5a4d2771 100644
--- a/sbin/ipsec/photurisd/errlog.c
+++ b/sbin/photurisd/errlog.c
@@ -31,11 +31,11 @@
  */
 
 /*
- * $OpenBSD: errlog.c,v 1.6 1998/07/10 20:27:42 provos Exp $
+ * $OpenBSD: errlog.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: errlog.c,v 1.6 1998/07/10 20:27:42 provos Exp $";
+static char rcsid[] = "$Id: errlog.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #define _ERRLOG_C_
diff --git a/sbin/ipsec/photurisd/errlog.h b/sbin/photurisd/errlog.h
index e23a74343a1..e23a74343a1 100644
--- a/sbin/ipsec/photurisd/errlog.h
+++ b/sbin/photurisd/errlog.h
diff --git a/sbin/ipsec/photurisd/exchange.c b/sbin/photurisd/exchange.c
index 6fb004efcbb..0e584bef1bf 100644
--- a/sbin/ipsec/photurisd/exchange.c
+++ b/sbin/photurisd/exchange.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: exchange.c,v 1.3 1998/10/02 16:52:56 niklas Exp $";
+static char rcsid[] = "$Id: exchange.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #define _EXCHANGE_C_
diff --git a/sbin/ipsec/photurisd/exchange.h b/sbin/photurisd/exchange.h
index c8e86a8c994..ba32df6cda3 100644
--- a/sbin/ipsec/photurisd/exchange.h
+++ b/sbin/photurisd/exchange.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: exchange.h,v 1.2 1997/07/24 23:47:12 provos Exp $ */
+/* $Id: exchange.h,v 1.1 1998/11/14 23:37:23 deraadt Exp $ */
 /* 
  * exchange.h: 
  * exchange generation header file
diff --git a/sbin/ipsec/photurisd/handle_bad_cookie.c b/sbin/photurisd/handle_bad_cookie.c
index 8767f555940..db801d0c245 100644
--- a/sbin/ipsec/photurisd/handle_bad_cookie.c
+++ b/sbin/photurisd/handle_bad_cookie.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_bad_cookie.c,v 1.1 1997/07/18 22:48:50 provos Exp $";
+static char rcsid[] = "$Id: handle_bad_cookie.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_cookie_request.c b/sbin/photurisd/handle_cookie_request.c
index 13ab24c8131..2df03f0b867 100644
--- a/sbin/ipsec/photurisd/handle_cookie_request.c
+++ b/sbin/photurisd/handle_cookie_request.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_cookie_request.c,v 1.3 1997/07/25 16:21:42 provos Exp $";
+static char rcsid[] = "$Id: handle_cookie_request.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_cookie_response.c b/sbin/photurisd/handle_cookie_response.c
index 2aec528e689..03650e074cd 100644
--- a/sbin/ipsec/photurisd/handle_cookie_response.c
+++ b/sbin/photurisd/handle_cookie_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_cookie_response.c,v 1.1 1997/07/18 22:48:50 provos Exp $";
+static char rcsid[] = "$Id: handle_cookie_response.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_identity_request.c b/sbin/photurisd/handle_identity_request.c
index cfcad52ffed..b25a4bf7c1b 100644
--- a/sbin/ipsec/photurisd/handle_identity_request.c
+++ b/sbin/photurisd/handle_identity_request.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_identity_request.c,v 1.7 1998/06/30 16:58:41 provos Exp $";
+static char rcsid[] = "$Id: handle_identity_request.c,v 1.1 1998/11/14 23:37:23 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_identity_response.c b/sbin/photurisd/handle_identity_response.c
index f96dd62a784..d3618e4aa60 100644
--- a/sbin/ipsec/photurisd/handle_identity_response.c
+++ b/sbin/photurisd/handle_identity_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_identity_response.c,v 1.7 1998/06/30 16:58:44 provos Exp $";
+static char rcsid[] = "$Id: handle_identity_response.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_message_reject.c b/sbin/photurisd/handle_message_reject.c
index 6c6db7c5062..fbb971ff504 100644
--- a/sbin/ipsec/photurisd/handle_message_reject.c
+++ b/sbin/photurisd/handle_message_reject.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_message_reject.c,v 1.1 1997/07/18 22:48:50 provos Exp $";
+static char rcsid[] = "$Id: handle_message_reject.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_resource_limit.c b/sbin/photurisd/handle_resource_limit.c
index 2fa5b38e70f..90994da4154 100644
--- a/sbin/ipsec/photurisd/handle_resource_limit.c
+++ b/sbin/photurisd/handle_resource_limit.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_resource_limit.c,v 1.2 1997/09/02 17:26:38 provos Exp $";
+static char rcsid[] = "$Id: handle_resource_limit.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_spi_needed.c b/sbin/photurisd/handle_spi_needed.c
index 3ea5b20a3a2..78518c902d1 100644
--- a/sbin/ipsec/photurisd/handle_spi_needed.c
+++ b/sbin/photurisd/handle_spi_needed.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_spi_needed.c,v 1.6 1998/05/18 21:25:27 provos Exp $";
+static char rcsid[] = "$Id: handle_spi_needed.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_spi_update.c b/sbin/photurisd/handle_spi_update.c
index 7cde3dcce29..985de3d7ae9 100644
--- a/sbin/ipsec/photurisd/handle_spi_update.c
+++ b/sbin/photurisd/handle_spi_update.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_spi_update.c,v 1.6 1998/05/18 21:25:28 provos Exp $";
+static char rcsid[] = "$Id: handle_spi_update.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_value_request.c b/sbin/photurisd/handle_value_request.c
index 614061a42de..fdad1bf7f79 100644
--- a/sbin/ipsec/photurisd/handle_value_request.c
+++ b/sbin/photurisd/handle_value_request.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_value_request.c,v 1.5 1998/03/04 11:43:26 provos Exp $";
+static char rcsid[] = "$Id: handle_value_request.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/handle_value_response.c b/sbin/photurisd/handle_value_response.c
index cbd542c7310..cd07867fa9a 100644
--- a/sbin/ipsec/photurisd/handle_value_response.c
+++ b/sbin/photurisd/handle_value_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_value_response.c,v 1.4 1998/03/04 11:43:27 provos Exp $";
+static char rcsid[] = "$Id: handle_value_response.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdlib.h>
diff --git a/sbin/ipsec/photurisd/handle_verification_failure.c b/sbin/photurisd/handle_verification_failure.c
index d57e1eb0fe7..20d93aff05d 100644
--- a/sbin/ipsec/photurisd/handle_verification_failure.c
+++ b/sbin/photurisd/handle_verification_failure.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: handle_verification_failure.c,v 1.1 1997/07/18 22:48:50 provos Exp $";
+static char rcsid[] = "$Id: handle_verification_failure.c,v 1.1 1998/11/14 23:37:24 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/identity.c b/sbin/photurisd/identity.c
index 90f91f15a9f..3b3ad455c3b 100644
--- a/sbin/ipsec/photurisd/identity.c
+++ b/sbin/photurisd/identity.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: identity.c,v 1.6 1998/05/18 21:25:30 provos Exp $";
+static char rcsid[] = "$Id: identity.c,v 1.1 1998/11/14 23:37:25 deraadt Exp $";
 #endif
 
 #define _IDENTITY_C_
diff --git a/sbin/ipsec/photurisd/identity.h b/sbin/photurisd/identity.h
index 46802c16bfc..46802c16bfc 100644
--- a/sbin/ipsec/photurisd/identity.h
+++ b/sbin/photurisd/identity.h
diff --git a/sbin/ipsec/photurisd/kernel.c b/sbin/photurisd/kernel.c
index a0604362ba2..60398e5fec7 100644
--- a/sbin/ipsec/photurisd/kernel.c
+++ b/sbin/photurisd/kernel.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: kernel.c,v 1.11 1998/06/30 16:58:31 provos Exp $";
+static char rcsid[] = "$Id: kernel.c,v 1.1 1998/11/14 23:37:25 deraadt Exp $";
 #endif
 
 #include <time.h>
diff --git a/sbin/ipsec/photurisd/kernel.h b/sbin/photurisd/kernel.h
index c52f3951021..01f32d3b4f2 100644
--- a/sbin/ipsec/photurisd/kernel.h
+++ b/sbin/photurisd/kernel.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: kernel.h,v 1.7 1998/06/30 16:58:33 provos Exp $ */
+/* $Id: kernel.h,v 1.1 1998/11/14 23:37:25 deraadt Exp $ */
 /*
  * kernel.h: 
  * security paramter index creation.
diff --git a/sbin/ipsec/photurisd/modulus.c b/sbin/photurisd/modulus.c
index c0bbd91277d..c0bbd91277d 100644
--- a/sbin/ipsec/photurisd/modulus.c
+++ b/sbin/photurisd/modulus.c
diff --git a/sbin/ipsec/photurisd/modulus.h b/sbin/photurisd/modulus.h
index e79cedb2017..bf76b4cae49 100644
--- a/sbin/ipsec/photurisd/modulus.h
+++ b/sbin/photurisd/modulus.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: modulus.h,v 1.1 1997/07/18 22:48:49 provos Exp $ */
+/* $Id: modulus.h,v 1.1 1998/11/14 23:37:25 deraadt Exp $ */
 /* 
  * modulus.h: 
  * modulus handling functions
diff --git a/sbin/ipsec/photurisd/packet.c b/sbin/photurisd/packet.c
index 9b1ced8041b..1e0fb74a4f4 100644
--- a/sbin/ipsec/photurisd/packet.c
+++ b/sbin/photurisd/packet.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: packet.c,v 1.2 1998/03/04 11:43:35 provos Exp $";
+static char rcsid[] = "$Id: packet.c,v 1.1 1998/11/14 23:37:25 deraadt Exp $";
 #endif
 
 #define _PACKET_C_
diff --git a/sbin/ipsec/photurisd/packet.h b/sbin/photurisd/packet.h
index ae1753d7929..9b341f17f7d 100644
--- a/sbin/ipsec/photurisd/packet.h
+++ b/sbin/photurisd/packet.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: packet.h,v 1.2 1998/03/04 11:43:36 provos Exp $ */
+/* $Id: packet.h,v 1.1 1998/11/14 23:37:25 deraadt Exp $ */
 /*
  * packet.h: 
  * prototyped for receiving and anwsering packets
diff --git a/sbin/ipsec/photurisd/packets.h b/sbin/photurisd/packets.h
index 4fd87c4ec90..dbfe3d8a9b3 100644
--- a/sbin/ipsec/photurisd/packets.h
+++ b/sbin/photurisd/packets.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: packets.h,v 1.2 1998/03/04 11:43:37 provos Exp $ */
+/* $Id: packets.h,v 1.1 1998/11/14 23:37:26 deraadt Exp $ */
 /*
  * packets.h:
  */
diff --git a/sbin/ipsec/photurisd/photuris.h b/sbin/photurisd/photuris.h
index 41cc7d794fa..866921fe144 100644
--- a/sbin/ipsec/photurisd/photuris.h
+++ b/sbin/photurisd/photuris.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: photuris.h,v 1.3 1998/05/24 14:17:12 provos Exp $ */
+/* $Id: photuris.h,v 1.1 1998/11/14 23:37:26 deraadt Exp $ */
 /*
  * photuris.h:
  * general header file
diff --git a/sbin/ipsec/photurisd/photuris_cookie_request.c b/sbin/photurisd/photuris_cookie_request.c
index aad05e3368a..41038583ab1 100644
--- a/sbin/ipsec/photurisd/photuris_cookie_request.c
+++ b/sbin/photurisd/photuris_cookie_request.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_cookie_request.c,v 1.3 1997/09/02 17:26:44 provos Exp $";
+static char rcsid[] = "$Id: photuris_cookie_request.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_cookie_response.c b/sbin/photurisd/photuris_cookie_response.c
index 45fa28f17ba..d886f248471 100644
--- a/sbin/ipsec/photurisd/photuris_cookie_response.c
+++ b/sbin/photurisd/photuris_cookie_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_cookie_response.c,v 1.3 1997/07/24 23:47:17 provos Exp $";
+static char rcsid[] = "$Id: photuris_cookie_response.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_error_message.c b/sbin/photurisd/photuris_error_message.c
index 882b026fc20..6b8d3c7564d 100644
--- a/sbin/ipsec/photurisd/photuris_error_message.c
+++ b/sbin/photurisd/photuris_error_message.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_error_message.c,v 1.2 1997/09/02 17:26:45 provos Exp $";
+static char rcsid[] = "$Id: photuris_error_message.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_identity_request.c b/sbin/photurisd/photuris_identity_request.c
index ce9143dd0d7..0c71826534f 100644
--- a/sbin/ipsec/photurisd/photuris_identity_request.c
+++ b/sbin/photurisd/photuris_identity_request.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_identity_request.c,v 1.3 1998/06/30 16:58:43 provos Exp $";
+static char rcsid[] = "$Id: photuris_identity_request.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_identity_response.c b/sbin/photurisd/photuris_identity_response.c
index b11f54f2111..93785c12c7d 100644
--- a/sbin/ipsec/photurisd/photuris_identity_response.c
+++ b/sbin/photurisd/photuris_identity_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_identity_response.c,v 1.3 1998/06/30 16:58:42 provos Exp $";
+static char rcsid[] = "$Id: photuris_identity_response.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_packet_encrypt.c b/sbin/photurisd/photuris_packet_encrypt.c
index f0b2e7bbc3b..4d8f9b78f20 100644
--- a/sbin/ipsec/photurisd/photuris_packet_encrypt.c
+++ b/sbin/photurisd/photuris_packet_encrypt.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint 
-static char rcsid[] = "$Id: photuris_packet_encrypt.c,v 1.2 1998/03/04 11:43:41 provos Exp $";
+static char rcsid[] = "$Id: photuris_packet_encrypt.c,v 1.1 1998/11/14 23:37:26 deraadt Exp $";
 #endif 
 
 #define _ENCRYPT_C_
diff --git a/sbin/ipsec/photurisd/photuris_spi_needed.c b/sbin/photurisd/photuris_spi_needed.c
index 1831390526c..e858c44919b 100644
--- a/sbin/ipsec/photurisd/photuris_spi_needed.c
+++ b/sbin/photurisd/photuris_spi_needed.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_spi_needed.c,v 1.1 1997/07/18 22:48:49 provos Exp $";
+static char rcsid[] = "$Id: photuris_spi_needed.c,v 1.1 1998/11/14 23:37:27 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_spi_update.c b/sbin/photurisd/photuris_spi_update.c
index 759ea014fdb..250f85f4142 100644
--- a/sbin/ipsec/photurisd/photuris_spi_update.c
+++ b/sbin/photurisd/photuris_spi_update.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_spi_update.c,v 1.1 1997/07/18 22:48:49 provos Exp $";
+static char rcsid[] = "$Id: photuris_spi_update.c,v 1.1 1998/11/14 23:37:27 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_value_request.c b/sbin/photurisd/photuris_value_request.c
index a2b3318294d..35344ac683b 100644
--- a/sbin/ipsec/photurisd/photuris_value_request.c
+++ b/sbin/photurisd/photuris_value_request.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_value_request.c,v 1.2 1998/03/04 11:43:43 provos Exp $";
+static char rcsid[] = "$Id: photuris_value_request.c,v 1.1 1998/11/14 23:37:27 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photuris_value_response.c b/sbin/photurisd/photuris_value_response.c
index 090233c5e16..4339e23b17b 100644
--- a/sbin/ipsec/photurisd/photuris_value_response.c
+++ b/sbin/photurisd/photuris_value_response.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: photuris_value_response.c,v 1.2 1998/03/04 11:43:44 provos Exp $";
+static char rcsid[] = "$Id: photuris_value_response.c,v 1.1 1998/11/14 23:37:27 deraadt Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/sbin/ipsec/photurisd/photurisd.8 b/sbin/photurisd/photurisd.8
index 06c8f6d8a11..a73f603edfe 100644
--- a/sbin/ipsec/photurisd/photurisd.8
+++ b/sbin/photurisd/photurisd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: photurisd.8,v 1.8 1998/07/24 20:49:06 deraadt Exp $
+.\" $OpenBSD: photurisd.8,v 1.1 1998/11/14 23:37:27 deraadt Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
diff --git a/sbin/ipsec/photurisd/photurisd.c b/sbin/photurisd/photurisd.c
index aba740f969d..ba87c5cc31a 100644
--- a/sbin/ipsec/photurisd/photurisd.c
+++ b/sbin/photurisd/photurisd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint 
-static char rcsid[] = "$Id: photurisd.c,v 1.9 1998/06/30 16:58:38 provos Exp $";
+static char rcsid[] = "$Id: photurisd.c,v 1.1 1998/11/14 23:37:28 deraadt Exp $";
 #endif 
 
 #define _PHOTURIS_C_
diff --git a/sbin/ipsec/photurisd/schedule.c b/sbin/photurisd/schedule.c
index 569565e30a8..7bbb95d6d64 100644
--- a/sbin/ipsec/photurisd/schedule.c
+++ b/sbin/photurisd/schedule.c
@@ -35,7 +35,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: schedule.c,v 1.8 1998/06/30 16:58:36 provos Exp $";
+static char rcsid[] = "$Id: schedule.c,v 1.1 1998/11/14 23:37:28 deraadt Exp $";
 #endif
 
 #define _SCHEDULE_C_
diff --git a/sbin/ipsec/photurisd/schedule.h b/sbin/photurisd/schedule.h
index cf3fb985719..482546dc925 100644
--- a/sbin/ipsec/photurisd/schedule.h
+++ b/sbin/photurisd/schedule.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: schedule.h,v 1.1 1997/07/18 22:48:50 provos Exp $ */
+/* $Id: schedule.h,v 1.1 1998/11/14 23:37:28 deraadt Exp $ */
 /*
  * schedule.h: 
  * schedule events like retransmission and clean ups.
diff --git a/sbin/ipsec/photurisd/scheme.c b/sbin/photurisd/scheme.c
index edb81c345cc..dc32ceb02ff 100644
--- a/sbin/ipsec/photurisd/scheme.c
+++ b/sbin/photurisd/scheme.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: scheme.c,v 1.1 1997/07/18 22:48:50 provos Exp $";
+static char rcsid[] = "$Id: scheme.c,v 1.1 1998/11/14 23:37:28 deraadt Exp $";
 #endif
 
 #define _SCHEME_C_
diff --git a/sbin/ipsec/photurisd/scheme.h b/sbin/photurisd/scheme.h
index 2c66a2a8a28..e31ea3bb3e1 100644
--- a/sbin/ipsec/photurisd/scheme.h
+++ b/sbin/photurisd/scheme.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: scheme.h,v 1.1 1997/07/18 22:48:50 provos Exp $ */
+/* $Id: scheme.h,v 1.1 1998/11/14 23:37:28 deraadt Exp $ */
 /*
  * scheme.h: 
  * security paramter index creation.
diff --git a/sbin/ipsec/photurisd/secrets.h b/sbin/photurisd/secrets.h
index 71e3564cf33..247bf48d52b 100644
--- a/sbin/ipsec/photurisd/secrets.h
+++ b/sbin/photurisd/secrets.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: secrets.h,v 1.3 1998/03/04 11:43:50 provos Exp $ */
+/* $Id: secrets.h,v 1.1 1998/11/14 23:37:28 deraadt Exp $ */
 /*
  * secrets.h:
  * prototypes for compute_secrets.c
diff --git a/sbin/ipsec/photurisd/server.c b/sbin/photurisd/server.c
index ac0ec192d17..fbeff3f9636 100644
--- a/sbin/ipsec/photurisd/server.c
+++ b/sbin/photurisd/server.c
@@ -35,7 +35,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: server.c,v 1.7 1998/08/17 22:12:42 provos Exp $";
+static char rcsid[] = "$Id: server.c,v 1.1 1998/11/14 23:37:28 deraadt Exp $";
 #endif
 
 #define _SERVER_C_
diff --git a/sbin/ipsec/photurisd/server.h b/sbin/photurisd/server.h
index 8991de3118b..a3bbef12375 100644
--- a/sbin/ipsec/photurisd/server.h
+++ b/sbin/photurisd/server.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: server.h,v 1.2 1998/05/18 21:25:38 provos Exp $ */
+/* $Id: server.h,v 1.1 1998/11/14 23:37:28 deraadt Exp $ */
 /*
  * server.h: 
  * handling interfaces and communication
diff --git a/sbin/ipsec/photurisd/spi.c b/sbin/photurisd/spi.c
index db28baf766d..92d77a00376 100644
--- a/sbin/ipsec/photurisd/spi.c
+++ b/sbin/photurisd/spi.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: spi.c,v 1.6 1998/06/30 16:58:35 provos Exp $";
+static char rcsid[] = "$Id: spi.c,v 1.1 1998/11/14 23:37:29 deraadt Exp $";
 #endif
 
 #define _SPI_C_
diff --git a/sbin/ipsec/photurisd/spi.h b/sbin/photurisd/spi.h
index 1057c5ff739..97e5e06a967 100644
--- a/sbin/ipsec/photurisd/spi.h
+++ b/sbin/photurisd/spi.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: spi.h,v 1.3 1997/07/23 12:28:55 provos Exp $ */
+/* $Id: spi.h,v 1.1 1998/11/14 23:37:29 deraadt Exp $ */
 /*
  * spi.h: 
  * security paramter index creation.
diff --git a/sbin/ipsec/photurisd/state.c b/sbin/photurisd/state.c
index fe60213d6b2..fe60213d6b2 100644
--- a/sbin/ipsec/photurisd/state.c
+++ b/sbin/photurisd/state.c
diff --git a/sbin/ipsec/photurisd/state.h b/sbin/photurisd/state.h
index 302543be074..b1cda79627a 100644
--- a/sbin/ipsec/photurisd/state.h
+++ b/sbin/photurisd/state.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: state.h,v 1.7 1998/05/18 21:25:41 provos Exp $ */
+/* $Id: state.h,v 1.1 1998/11/14 23:37:29 deraadt Exp $ */
 /*
  * state.h: 
  * state object
diff --git a/sbin/ipsec/photurisd/userdefs.h b/sbin/photurisd/userdefs.h
index 253db82333e..7550e058fd5 100644
--- a/sbin/ipsec/photurisd/userdefs.h
+++ b/sbin/photurisd/userdefs.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: userdefs.h,v 1.1 1997/07/18 22:48:49 provos Exp $ */
+/* $Id: userdefs.h,v 1.1 1998/11/14 23:37:29 deraadt Exp $ */
 /*
  * userdefs.h: 
  * handling userdefs
diff --git a/sbin/ipsec/photurisd/utypes.h b/sbin/photurisd/utypes.h
index a4fe219d0bf..a4fe219d0bf 100644
--- a/sbin/ipsec/photurisd/utypes.h
+++ b/sbin/photurisd/utypes.h
diff --git a/sbin/ipsec/photurisd/validity.c b/sbin/photurisd/validity.c
index 92d778bb63e..6e70d4ca92f 100644
--- a/sbin/ipsec/photurisd/validity.c
+++ b/sbin/photurisd/validity.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: validity.c,v 1.2 1997/09/02 17:26:50 provos Exp $";
+static char rcsid[] = "$Id: validity.c,v 1.1 1998/11/14 23:37:30 deraadt Exp $";
 #endif
 
 #define _VALIDITY_C_
diff --git a/sbin/ipsec/photurisd/validity.h b/sbin/photurisd/validity.h
index c51136ff2a0..c51136ff2a0 100644
--- a/sbin/ipsec/photurisd/validity.h
+++ b/sbin/photurisd/validity.h
diff --git a/sbin/ipsec/startkey/Makefile b/sbin/startkey/Makefile
index 87f7eed127a..87f7eed127a 100644
--- a/sbin/ipsec/startkey/Makefile
+++ b/sbin/startkey/Makefile
diff --git a/sbin/ipsec/startkey/startkey.1 b/sbin/startkey/startkey.1
index c383290b555..d878d7d7175 100644
--- a/sbin/ipsec/startkey/startkey.1
+++ b/sbin/startkey/startkey.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: startkey.1,v 1.7 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: startkey.1,v 1.1 1998/11/14 23:37:30 deraadt Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
diff --git a/sbin/ipsec/startkey/startkey.c b/sbin/startkey/startkey.c
index 22882804c97..bbc0a4a6a27 100644
--- a/sbin/ipsec/startkey/startkey.c
+++ b/sbin/startkey/startkey.c
@@ -31,7 +31,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: startkey.c,v 1.3 1997/08/24 18:31:25 millert Exp $";
+static char rcsid[] = "$Id: startkey.c,v 1.1 1998/11/14 23:37:30 deraadt Exp $";
 #endif
 
 #include <stdio.h>