--- mqtt/src/mqtt_subs.c	2012/05/08 11:45:57	1.2.2.6
+++ mqtt/src/mqtt_subs.c	2012/05/08 13:04:02	1.2.2.7
@@ -83,10 +83,12 @@ Unsubscribe(int sock)
 	srandomdev();
 	mid = random() % USHRT_MAX;
 
+	printf(" > Execute UNSUBSCRIBE request #%d ... ", mid);
 	if (mqtt_cli_Unsubscribe(args->cli, args->subscr, mid, args->Dup, MQTT_QOS_ACK)) {
 		printf("Error:: Unsubscribe #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
-	}
+	} else
+		printf("OK\n");
 
 	return 0;
 }
@@ -270,7 +272,9 @@ main(int argc, char **argv)
 		else
 			lf = stdout;
 		if (lf) {
-			ret = un ? Unsubscribe(args->cli->sock) : Subscribe(args->cli->sock, lf);
+			ret = Subscribe(args->cli->sock, lf);
+			if (un)
+				Unsubscribe(args->cli->sock);
 			fclose(lf);
 		} else
 			printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));