summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sshd.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2c408552..6369799e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120070605
2 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2007/05/22 10:18:52
4 [sshd.c]
5 zap double include; from p_nowaczyk AT o2.pl
6 (not required in -portable, Id sync only)
7
120070520 820070520
2 - (dtucker) OpenBSD CVS Sync 9 - (dtucker) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2007/04/14 22:01:58 10 - stevesk@cvs.openbsd.org 2007/04/14 22:01:58
@@ -2940,4 +2947,4 @@
2940 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2947 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2941 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2948 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2942 2949
2943$Id: ChangeLog,v 1.4670 2007/05/20 05:26:07 dtucker Exp $ 2950$Id: ChangeLog,v 1.4671 2007/06/05 08:22:32 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 7135c4dd3..04778ea99 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.350 2007/03/09 05:20:06 dtucker Exp $ */ 1/* $OpenBSD: sshd.c,v 1.351 2007/05/22 10:18:52 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland