--- a/src/replication/replicator/doveadm-connection.c	Thu Dec 22 11:53:06 2016 -0500
+++ b/src/replication/replicator/doveadm-connection.c	Tue Dec 20 10:03:40 2016 +0200
@@ -72,7 +72,7 @@
 		    waiting_failed_count);
 	str_printfa(str, "Total number of known users\t%u\n", user_count);
 	str_append_c(str, '\n');
-	o_stream_send(client->conn.output, str_data(str), str_len(str));
+	o_stream_nsend(client->conn.output, str_data(str), str_len(str));
 	return 0;
 }
 
@@ -103,10 +103,10 @@
 			    (long long)user->last_full_sync,
 			    user->last_sync_failed,
 			    (long long)user->last_successful_sync);
-		o_stream_send(client->conn.output, str_data(str), str_len(str));
+		o_stream_nsend(client->conn.output, str_data(str), str_len(str));
 	}
 	replicator_queue_iter_deinit(&iter);
-	o_stream_send(client->conn.output, "\n", 1);
+	o_stream_nsend(client->conn.output, "\n", 1);
 	return 0;
 }
 
@@ -144,7 +144,7 @@
 	}
 
 	str_append_c(str, '\n');
-	o_stream_send(client->conn.output, str_data(str), str_len(str));
+	o_stream_nsend(client->conn.output, str_data(str), str_len(str));
 	return 0;
 }
 
@@ -166,7 +166,7 @@
 		return -1;
 	}
 	if (replication_priority_parse(args[0], &priority) < 0) {
-		o_stream_send_str(client->conn.output, "-Invalid priority\n");
+		o_stream_nsend_str(client->conn.output, "-Invalid priority\n");
 		return 0;
 	}
 	full = strchr(args[1], 'f') != NULL;
@@ -175,7 +175,7 @@
 		user = replicator_queue_add(queue, usermask, priority);
 		if (full)
 			user->force_full_sync = TRUE;
-		o_stream_send_str(client->conn.output, "+1\n");
+		o_stream_nsend_str(client->conn.output, "+1\n");
 		return 0;
 	}
 
@@ -190,7 +190,7 @@
 		match_count++;
 	}
 	replicator_queue_iter_deinit(&iter);
-	o_stream_send_str(client->conn.output,
+	o_stream_nsend_str(client->conn.output,
 			  t_strdup_printf("+%u\n", match_count));
 	return 0;
 }
@@ -216,7 +216,7 @@
 		replicator_queue_add_auth_users(queue, set->auth_socket_path,
 						args[0], ioloop_time);
 	}
-	o_stream_send_str(client->conn.output, "+\n");
+	o_stream_nsend_str(client->conn.output, "+\n");
 	return 0;
 }
 
@@ -234,10 +234,10 @@
 	}
 	user = replicator_queue_lookup(queue, args[0]);
 	if (user == NULL)
-		o_stream_send_str(client->conn.output, "-User not found\n");
+		o_stream_nsend_str(client->conn.output, "-User not found\n");
 	else {
 		replicator_queue_remove(queue, &user);
-		o_stream_send_str(client->conn.output, "+\n");
+		o_stream_nsend_str(client->conn.output, "+\n");
 	}
 	return 0;
 }
@@ -265,7 +265,7 @@
 		i_free(user->state);
 		user->state = i_strdup(args[2]);
 	}
-	o_stream_send_str(client->conn.output, "+\n");
+	o_stream_nsend_str(client->conn.output, "+\n");
 	return 0;
 }