summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 14:29:06 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 14:29:06 +1100
commite3b21a5f59105174ba923beea8132fc20335130a (patch)
tree191e6bb3b8d333cf33cd459a804d4ad53e4d6ec3
parenta0fdce9a47dfa572fde97e1a2ee9b33efb9fd549 (diff)
- deraadt@cvs.openbsd.org 2006/03/25 18:58:10
[channels.c] delete cast not required
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 40764996..00ce8ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/channels.c b/channels.c
index 57634a21..87e68131 100644
--- a/channels.c
+++ b/channels.c
@@ -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) {