--- a/cli-agentfwd.c	Tue Aug 25 05:24:18 2009 +0000
+++ b/cli-agentfwd.c	Tue Aug 25 11:11:35 2009 +0000
@@ -66,6 +66,10 @@
 
 	fd = connect_unix(agent_sock);
 
+	if (fd < 0) {
+		dropbear_log(LOG_INFO, "Failed to connect to agent");
+	}
+
 	return fd;
 }
 
@@ -79,6 +83,9 @@
 		return SSH_OPEN_ADMINISTRATIVELY_PROHIBITED;
 
 	fd = connect_agent();
+	if (cli_opts.agent_fd < 0) {
+		return SSH_OPEN_CONNECT_FAILED;
+	}
 
 	setnonblocking(fd);
 
@@ -243,7 +250,6 @@
 	/* agent_fd will be closed after successful auth */
 	cli_opts.agent_fd = connect_agent();
 	if (cli_opts.agent_fd < 0) {
-		dropbear_log(LOG_INFO, "Failed to connect to agent");
 		return;
 	}