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 @@
 20130913
+ - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code;
+   ok dtucker@
  - (djm) Release 6.3p1
 
 20130808
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)
         s5_rsp.command = SSH_SOCKS5_SUCCESS;
         s5_rsp.reserved = 0;                    /* ignored */
         s5_rsp.atyp = SSH_SOCKS5_IPV4;
-        ((struct in_addr *)&dest_addr)->s_addr = INADDR_ANY;
         dest_port = 0;                          /* ignored */
 
         buffer_append(&c->output, &s5_rsp, sizeof(s5_rsp));
-        buffer_append(&c->output, &dest_addr, sizeof(struct in_addr));
+        buffet_put_int(&c->output, ntohl(INADDR_ANY));
         buffer_append(&c->output, &dest_port, sizeof(dest_port));
         return 1;
 }