summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--channels.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0601f67d2..091f0d8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
120130913 120130913
2 - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code;
3 ok dtucker@
2 - (djm) Release 6.3p1 4 - (djm) Release 6.3p1
3 5
420130808 620130808
diff --git a/channels.c b/channels.c
index 281df3802..b5144f112 100644
--- a/channels.c
+++ b/channels.c
@@ -1239,11 +1239,10 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
1239 s5_rsp.command = SSH_SOCKS5_SUCCESS; 1239 s5_rsp.command = SSH_SOCKS5_SUCCESS;
1240 s5_rsp.reserved = 0; /* ignored */ 1240 s5_rsp.reserved = 0; /* ignored */
1241 s5_rsp.atyp = SSH_SOCKS5_IPV4; 1241 s5_rsp.atyp = SSH_SOCKS5_IPV4;
1242 ((struct in_addr *)&dest_addr)->s_addr = INADDR_ANY;
1243 dest_port = 0; /* ignored */ 1242 dest_port = 0; /* ignored */
1244 1243
1245 buffer_append(&c->output, &s5_rsp, sizeof(s5_rsp)); 1244 buffer_append(&c->output, &s5_rsp, sizeof(s5_rsp));
1246 buffer_append(&c->output, &dest_addr, sizeof(struct in_addr)); 1245 buffet_put_int(&c->output, ntohl(INADDR_ANY));
1247 buffer_append(&c->output, &dest_port, sizeof(dest_port)); 1246 buffer_append(&c->output, &dest_port, sizeof(dest_port));
1248 return 1; 1247 return 1;
1249} 1248}