- (djm) [channels.c] sigh, typo s/buffet_/buffer_/

ok dtucker@

ChangeLog

@@ -1,73 +1,8 @@
-20130828
- - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
-   'j' (intmax_t/uintmax_t) and 'z' (size_t/ssize_t) conversions in case we
-   start to use them in the future.
- - (djm) [openbsd-compat/bsd-snprintf.c] #ifdef noytet for intmax_t bits
-   until we have configure support.
-
-20130821
- - (djm) OpenBSD CVS Sync
-   - [email protected] 2013/08/06 23:03:49
-     [sftp.c]
-     fix some whitespace at EOL
-     make list of commands an enum rather than a long list of defines
-     add -a to usage()
-   - [email protected] 2013/08/06 23:05:01
-     [sftp.1]
-     document top-level -a option (the -a option to 'get' was already
-     documented)
-   - [email protected] 2013/08/06 23:06:01
-     [servconf.c]
-     add cast to avoid format warning; from portable
-   - [email protected] 2013/08/07 06:24:51
-     [sftp.1 sftp.c]
-     sort -a;
-   - [email protected] 2013/08/08 04:52:04
-     [sftp.c]
-     fix two year old regression: symlinking a file would incorrectly
-     canonicalise the target path. bz#2129 report from delphij AT freebsd.org
-   - [email protected] 2013/08/08 05:04:03
-     [sftp-client.c sftp-client.h sftp.c]
-     add a "-l" flag for the rename command to force it to use the silly
-     standard SSH_FXP_RENAME command instead of the POSIX-rename- like
-     [email protected] extension.
-
-     intended for use in regress tests, so no documentation.
-   - [email protected] 2013/08/09 03:37:25
-     [sftp.c]
-     do getopt parsing for all sftp commands (with an empty optstring for
-     commands without arguments) to ensure consistent behaviour
-   - [email protected] 2013/08/09 03:39:13
-     [sftp-client.c]
-     two problems found by a to-be-committed regress test: 1) msg_id was not
-     being initialised so was starting at a random value from the heap
-     (harmless, but confusing). 2) some error conditions were not being
-     propagated back to the caller
-   - [email protected] 2013/08/09 03:56:42
-     [sftp.c]
-     enable ctrl-left-arrow and ctrl-right-arrow to move forward/back a word;
-     matching ksh's relatively recent change.
-   - [email protected] 2013/08/13 18:32:08
-     [ssh-keygen.c]
-     typo in error message; from Stephan Rickauer
-   - [email protected] 2013/08/13 18:33:08
-     [ssh-keygen.c]
-     another of the same typo
-   - [email protected] 2013/08/14 08:39:27
-     [scp.1 ssh.1]
-     some Bx/Ox conversion;
-     From: Jan Stary
-   - [email protected] 2013/08/20 00:11:38
-     [readconf.c readconf.h ssh_config.5 sshconnect.c]
-     Add a ssh_config ProxyUseFDPass option that supports the use of
-     ProxyCommands that establish a connection and then pass a connected
-     file descriptor back to ssh(1). This allows the ProxyCommand to exit
-     rather than have to shuffle data back and forth and enables ssh to use
-     getpeername, etc. to obtain address information just like it does with
-     regular directly-connected sockets. ok markus@
-   - [email protected] 2013/08/20 06:56:07
-     [ssh.1 ssh_config.5]
-     some proxyusefdpass tweaks;
+20130913
+ - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code;
+   ok dtucker@
+ - (djm) [channels.c] sigh, typo s/buffet_/buffer_/
+ - (djm) Release 6.3p1
 
 20130808
  - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt

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));
+	buffer_put_int(&c->output, ntohl(INADDR_ANY)); /* bind address */
 	buffer_append(&c->output, &dest_port, sizeof(dest_port));
 	return 1;
 }