RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-16 23:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2006/03/25 18:58:10

Browse Source 
[channels.c]
     delete cast not required
This commit is contained in:
Damien Miller 2006-03-26 14:29:06 +11:00
parent a0fdce9a47
commit e3b21a5f59
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

@ -171,6 +171,9 @@
- deraadt@cvs.openbsd.org 2006/03/25 18:56:55
[bufaux.c channels.c packet.c]
remove (char *) casts to a function that accepts void * for the arg
- deraadt@cvs.openbsd.org 2006/03/25 18:58:10
[channels.c]
delete cast not required
20060325
- OpenBSD CVS Sync
@ -4428,4 +4431,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.4284 2006/03/26 03:28:50 djm Exp $
$Id: ChangeLog,v 1.4285 2006/03/26 03:29:06 djm Exp $

4
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.246 2006/03/25 18:56:54 deraadt Exp $ */
/* $OpenBSD: channels.c,v 1.247 2006/03/25 18:58:10 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1049,7 +1049,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
debug2("channel %d: socks5 post auth", c->self);
if (have < sizeof(s5_req)+1)
return 0; /* need more */
memcpy((char *)&s5_req, p, sizeof(s5_req));
memcpy(&s5_req, p, sizeof(s5_req));
if (s5_req.version != 0x05 ||
s5_req.command != SSH_SOCKS5_CONNECT ||
s5_req.reserved != 0x00) {