--- mqtt/src/mqtt_pub.c	2011/12/20 16:04:34	1.1.2.2
+++ mqtt/src/mqtt_pub.c	2011/12/24 17:30:29	1.1.2.3
@@ -167,7 +167,7 @@ main(int argc, char **argv)
 	}
 
 	printf("Connected ... ");
-	switch ((ret = try2Connect(sock))) {
+	switch ((ret = ConnectClient(sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -194,10 +194,12 @@ main(int argc, char **argv)
 	if (ret == MQTT_RETCODE_ACCEPTED) {
 		ret = Publish(sock);
 		shutdown(sock, SHUT_RDWR);
-	} else
+		CloseClient(sock);
+	} else {
+		close(sock);
 		ret = 3;
+	}
 
-	close(sock);
 	args->free(args);
 	free(args);
 	return ret;