RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2008/06/13 00:47:53 

[mux.c]
     upcast size_t to u_long to match format arg; ok djm@
This commit is contained in:
Darren Tucker 2008-06-13 10:58:10 +10:00
parent 61b0695273
commit 1adfd368c4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -148,6 +148,9 @@
fall back to creating a new TCP connection on most multiplexing errors fall back to creating a new TCP connection on most multiplexing errors
(socket connect fail, invalid version, refused permittion, corrupted (socket connect fail, invalid version, refused permittion, corrupted
messages, etc.); bz #1329 ok dtucker@ messages, etc.); bz #1329 ok dtucker@
- dtucker@cvs.openbsd.org 2008/06/13 00:47:53
[mux.c]
upcast size_t to u_long to match format arg; ok djm@
- (dtucker) [clientloop.c serverloop.c] channel_register_filter now - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
takes 2 more args. with djm@ takes 2 more args. with djm@
- (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch
@ -4314,4 +4317,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4996 2008/06/13 00:28:57 dtucker Exp $ $Id: ChangeLog,v 1.4997 2008/06/13 00:58:10 dtucker Exp $

4
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.5 2008/06/13 00:16:49 djm Exp $ */ /* $OpenBSD: mux.c,v 1.6 2008/06/13 00:47:53 dtucker Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -711,7 +711,7 @@ muxclient(const char *path)
leave_raw_mode(); leave_raw_mode();
if (i > (int)sizeof(int)) if (i > (int)sizeof(int))
fatal("%s: master returned too much data (%d > %lu)", fatal("%s: master returned too much data (%d > %lu)",
__func__, i, sizeof(int)); __func__, i, (u_long)sizeof(int));
if (muxclient_terminate) { if (muxclient_terminate) {
debug2("Exiting on signal %d", muxclient_terminate); debug2("Exiting on signal %d", muxclient_terminate);
exitval[0] = 255; exitval[0] = 255;