summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2006-06-13 02:59:53 +0000
committerdjm <djm>2006-06-13 02:59:53 +0000
commit0e848178c38785f965a8ff926dfd5f68fe168248 (patch)
treed27885c2081e61e27da52e8bff905a9e4d16bade
parent390c5fcc6dc463c90cd71fbf6b9bb4caf875c2a2 (diff)
downloadopenssh-0e848178c38785f965a8ff926dfd5f68fe168248.tar.gz
- djm@cvs.openbsd.org 2006/05/08 10:49:48
[sshconnect2.c] uint32_t -> u_int32_t (which we use everywhere else) (Id sync only - portable already had this)
-rw-r--r--ChangeLog9
-rw-r--r--sshconnect2.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 767208bf..6b5c74b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060613
+ - OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2006/05/08 10:49:48
+ [sshconnect2.c]
+ uint32_t -> u_int32_t (which we use everywhere else)
+ (Id sync only - portable already had this)
+
20060521
- (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
and slave, we can remove the special-case handling in the audit hook in
@@ -4630,4 +4637,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4330 2006/05/21 08:26:40 dtucker Exp $
+$Id: ChangeLog,v 1.4331 2006/06/13 02:59:53 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 6fdcf8a1..53cf2576 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.152 2006/04/25 08:02:27 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.153 2006/05/08 10:49:48 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*