X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fchannel.c;h=f2daf0d50e360f050e3146431b1fede07833ddf3;hp=75a911f2af3ec7080085c648792d23393f82ad1c;hb=94a61469bd430d5906b5c976379dd16e32d73933;hpb=a58c490f0bff52a73717d31d04d1472629180de2

diff --git a/src/lib/lttng-ctl/channel.c b/src/lib/lttng-ctl/channel.c
index 75a911f2a..f2daf0d50 100644
--- a/src/lib/lttng-ctl/channel.c
+++ b/src/lib/lttng-ctl/channel.c
@@ -81,7 +81,9 @@ int receive_message(struct lttng_notification_channel *channel)
 end:
 	return ret;
 error:
-	lttng_dynamic_buffer_set_size(&channel->reception_buffer, 0);
+	if (lttng_dynamic_buffer_set_size(&channel->reception_buffer, 0)) {
+		ret = -1;
+	}
 	goto end;
 }
 
@@ -213,6 +215,8 @@ lttng_notification_channel_get_next_notification(
 		goto end;
 	}
 
+	pthread_mutex_lock(&channel->lock);
+
 	if (channel->pending_notifications.count) {
 		struct pending_notification *pending_notification;
 
@@ -230,11 +234,9 @@ lttng_notification_channel_get_next_notification(
 		cds_list_del(&pending_notification->node);
 		channel->pending_notifications.count--;
 		free(pending_notification);
-		goto end;
+		goto end_unlock;
 	}
 
-	pthread_mutex_lock(&channel->lock);
-
 	ret = receive_message(channel);
 	if (ret) {
 		status = LTTNG_NOTIFICATION_CHANNEL_STATUS_ERROR;
@@ -442,7 +444,7 @@ int handshake(struct lttng_notification_channel *channel)
 
 	pthread_mutex_lock(&channel->lock);
 
-	ret = lttcomm_send_unix_sock(channel->socket, send_buffer,
+	ret = lttcomm_send_creds_unix_sock(channel->socket, send_buffer,
 			sizeof(send_buffer));
 	if (ret < 0) {
 		goto end_unlock;