bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a merge fail

Browse Source
This commit is contained in:
nick
2012-07-24 09:21:40 +01:00
parent 53eca40fad
commit 2c0f86c018
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/control.c
View File

@@ -343,7 +343,7 @@ int control_mirror(struct control_client* client, int linesc, char** lines)
if (linesc > 3) { if (linesc > 3) {
connect_from = xmalloc( sizeof( union mysockaddr ) ); 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"); write_socket("1: bad bind address");
return -1; return -1;
} }