summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-08-03 07:28:57 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-08-03 07:28:57 +0000
commit9cf10c850740b3c058184c5889b03158fec0a84e (patch)
tree8ede25676794d4f82066b0e1b1b1a4538d5707e5
parent40a93a700e6253defebba6315e0be6624ff50bd0 (diff)
Merge with EOM 1.28
author: niklas From OpenBSD: be paranoid about the syslog format parameter
-rw-r--r--sbin/isakmpd/log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/isakmpd/log.c b/sbin/isakmpd/log.c
index 075efa8a176..d1170467824 100644
--- a/sbin/isakmpd/log.c
+++ b/sbin/isakmpd/log.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: log.c,v 1.11 2000/06/29 00:01:14 deraadt Exp $ */
-/* $EOM: log.c,v 1.27 2000/03/30 14:27:03 ho Exp $ */
+/* $OpenBSD: log.c,v 1.12 2000/08/03 07:28:56 niklas Exp $ */
+/* $EOM: log.c,v 1.28 2000/08/03 07:21:15 niklas Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.