summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sshconnect2.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 767208bf3..6b5c74b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120060613
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2006/05/08 10:49:48
4 [sshconnect2.c]
5 uint32_t -> u_int32_t (which we use everywhere else)
6 (Id sync only - portable already had this)
7
120060521 820060521
2 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 9 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
3 and slave, we can remove the special-case handling in the audit hook in 10 and slave, we can remove the special-case handling in the audit hook in
@@ -4630,4 +4637,4 @@
4630 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4637 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4631 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4638 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4632 4639
4633$Id: ChangeLog,v 1.4330 2006/05/21 08:26:40 dtucker Exp $ 4640$Id: ChangeLog,v 1.4331 2006/06/13 02:59:53 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 6fdcf8a1c..53cf25762 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.152 2006/04/25 08:02:27 dtucker Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.153 2006/05/08 10:49:48 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *