summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-06-05 18:22:32 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-06-05 18:22:32 +1000
commit4a40ae28c3d956dd5f2cddb6a6ee3393afdea731 (patch)
treecb5392504335cb3beade79ad54691406eb6ad8fd
parent2216471510b3de30cb9df3e81bdfa267152ecd39 (diff)
- djm@cvs.openbsd.org 2007/05/22 10:18:52
[sshd.c] zap double include; from p_nowaczyk AT o2.pl (not required in -portable, Id sync only)
-rw-r--r--ChangeLog9
-rw-r--r--sshd.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2c40855..6369799e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20070605
+ - (dtucker) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2007/05/22 10:18:52
+ [sshd.c]
+ zap double include; from p_nowaczyk AT o2.pl
+ (not required in -portable, Id sync only)
+
20070520
- (dtucker) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2007/04/14 22:01:58
@@ -2940,4 +2947,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4670 2007/05/20 05:26:07 dtucker Exp $
+$Id: ChangeLog,v 1.4671 2007/06/05 08:22:32 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 7135c4dd..04778ea9 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.350 2007/03/09 05:20:06 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.351 2007/05/22 10:18:52 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland