diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | mux.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -148,6 +148,9 @@ | |||
148 | fall back to creating a new TCP connection on most multiplexing errors | 148 | fall back to creating a new TCP connection on most multiplexing errors |
149 | (socket connect fail, invalid version, refused permittion, corrupted | 149 | (socket connect fail, invalid version, refused permittion, corrupted |
150 | messages, etc.); bz #1329 ok dtucker@ | 150 | messages, etc.); bz #1329 ok dtucker@ |
151 | - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 | ||
152 | [mux.c] | ||
153 | upcast size_t to u_long to match format arg; ok djm@ | ||
151 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now | 154 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
152 | takes 2 more args. with djm@ | 155 | takes 2 more args. with djm@ |
153 | - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch | 156 | - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch |
@@ -4314,4 +4317,4 @@ | |||
4314 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4317 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4315 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4318 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4316 | 4319 | ||
4317 | $Id: ChangeLog,v 1.4996 2008/06/13 00:28:57 dtucker Exp $ | 4320 | $Id: ChangeLog,v 1.4997 2008/06/13 00:58:10 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.5 2008/06/13 00:16:49 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.6 2008/06/13 00:47:53 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -711,7 +711,7 @@ muxclient(const char *path) | |||
711 | leave_raw_mode(); | 711 | leave_raw_mode(); |
712 | if (i > (int)sizeof(int)) | 712 | if (i > (int)sizeof(int)) |
713 | fatal("%s: master returned too much data (%d > %lu)", | 713 | fatal("%s: master returned too much data (%d > %lu)", |
714 | __func__, i, sizeof(int)); | 714 | __func__, i, (u_long)sizeof(int)); |
715 | if (muxclient_terminate) { | 715 | if (muxclient_terminate) { |
716 | debug2("Exiting on signal %d", muxclient_terminate); | 716 | debug2("Exiting on signal %d", muxclient_terminate); |
717 | exitval[0] = 255; | 717 | exitval[0] = 255; |