From 2c0f86c018a7c27b084ad97c116bf9a8b0653b67 Mon Sep 17 00:00:00 2001
From: nick <nick@bytemark.co.uk>
Date: Tue, 24 Jul 2012 09:21:40 +0100
Subject: [PATCH] Fix a merge fail

---
 src/control.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control.c b/src/control.c
index cf6788e..dcd5ee5 100644
--- a/src/control.c
+++ b/src/control.c
@@ -343,7 +343,7 @@ int control_mirror(struct control_client* client, int linesc, char** lines)
 
 	if (linesc > 3) {
 		connect_from = xmalloc( sizeof( union mysockaddr ) );
-		if (parse_ip_to_sockaddr(&connect_from->generic, lines[2]) == 0) {
+		if (parse_ip_to_sockaddr(&connect_from->generic, lines[3]) == 0) {
 			write_socket("1: bad bind address");
 			return -1;
 		}