=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-server.c,v retrieving revision 1.47.4.2 retrieving revision 1.48 diff -u -r1.47.4.2 -r1.48 --- src/usr.bin/ssh/sftp-server.c 2006/02/03 02:53:45 1.47.4.2 +++ src/usr.bin/ssh/sftp-server.c 2005/06/17 02:44:33 1.48 @@ -14,14 +14,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.47.4.2 2006/02/03 02:53:45 brad Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.48 2005/06/17 02:44:33 djm Exp $"); #include "buffer.h" #include "bufaux.h" #include "getput.h" #include "log.h" #include "xmalloc.h" -#include "misc.h" #include "sftp.h" #include "sftp-common.h" @@ -926,7 +925,7 @@ return; /* Incomplete message. */ cp = buffer_ptr(&iqueue); msg_len = GET_32BIT(cp); - if (msg_len > SFTP_MAX_MSG_LENGTH) { + if (msg_len > 256 * 1024) { error("bad message "); exit(11); } @@ -1016,9 +1015,6 @@ fd_set *rset, *wset; int in, out, max; ssize_t len, olen, set_size; - - /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ - sanitise_stdfd(); /* XXX should use getopt */