tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/01/13 21:54:53 

[mux.c]
     correct error messages; patch from bert.wesarg AT googlemail.com
This commit is contained in:
Damien Miller 2011-01-14 12:01:29 +11:00
parent 5278806e39
commit 445c9a507d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
20110214
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/01/13 21:54:53
[mux.c]
correct error messages; patch from bert.wesarg AT googlemail.com
20110213 20110213
- (djm) [misc.c] include time.h for nanosleep() prototype - (djm) [misc.c] include time.h for nanosleep() prototype
- (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm

10
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.23 2010/10/12 02:22:24 dtucker Exp $ */ /* $OpenBSD: mux.c,v 1.24 2011/01/13 21:54:53 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -1530,7 +1530,7 @@ mux_client_request_forward(int fd, u_int ftype, Forward *fwd)
case MUX_S_FAILURE: case MUX_S_FAILURE:
e = buffer_get_string(&m, NULL); e = buffer_get_string(&m, NULL);
buffer_free(&m); buffer_free(&m);
error("%s: session request failed: %s", __func__, e); error("%s: forwarding request failed: %s", __func__, e);
return -1; return -1;
default: default:
fatal("%s: unexpected response from master 0x%08x", fatal("%s: unexpected response from master 0x%08x",
@ -1649,12 +1649,12 @@ mux_client_request_session(int fd)
case MUX_S_PERMISSION_DENIED: case MUX_S_PERMISSION_DENIED:
e = buffer_get_string(&m, NULL); e = buffer_get_string(&m, NULL);
buffer_free(&m); buffer_free(&m);
error("Master refused forwarding request: %s", e); error("Master refused session request: %s", e);
return -1; return -1;
case MUX_S_FAILURE: case MUX_S_FAILURE:
e = buffer_get_string(&m, NULL); e = buffer_get_string(&m, NULL);
buffer_free(&m); buffer_free(&m);
error("%s: forwarding request failed: %s", __func__, e); error("%s: session request failed: %s", __func__, e);
return -1; return -1;
default: default:
buffer_free(&m); buffer_free(&m);
@ -1781,7 +1781,7 @@ mux_client_request_stdio_fwd(int fd)
case MUX_S_PERMISSION_DENIED: case MUX_S_PERMISSION_DENIED:
e = buffer_get_string(&m, NULL); e = buffer_get_string(&m, NULL);
buffer_free(&m); buffer_free(&m);
fatal("Master refused forwarding request: %s", e); fatal("Master refused stdio forwarding request: %s", e);
case MUX_S_FAILURE: case MUX_S_FAILURE:
e = buffer_get_string(&m, NULL); e = buffer_get_string(&m, NULL);
buffer_free(&m); buffer_free(&m);