ProxyCommand brokent in recent snapshots

[Iain Morgan]

Hello,

While testing recent snapshots (20131023 and 20131024) I encountered a
problem with ProxyCommand. The regression tests all passed, but the use
of ProxyCommand's in my ~/.ssh/config resulted in name resolution
errors; even if CanonicalizeHostname was explicitly set to "no."

The patch included inline below fixed the issue:

Index: ssh.c
===================================================================
RCS file: /cvs/openssh/ssh.c,v
retrieving revision 1.386
diff -u -r1.386 ssh.c
--- ssh.c	23 Oct 2013 05:31:11 -0000	1.386
+++ ssh.c	23 Oct 2013 18:42:01 -0000
@@ -915,7 +915,7 @@
 	 * resolve the bare hostname name using the system resolver's usual
 	 * search rules.
 	 */
-	if (addrs == NULL) {
+	if (addrs == NULL && options.proxy_command == NULL) {
 		if ((addrs = resolve_host(host, options.port, 1,
 		    cname, sizeof(cname))) == NULL)
 			cleanup_exit(255); /* resolve_host logs the error */

-- 
Iain Morgan