From 2bbf8b375239cd84eb127a53eb3b125021a1309a Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Thu, 25 Nov 2010 21:01:34 -0800
Subject: [PATCH] Logging

---
 guacamole/libguac/src/client.c               | 4 +++-
 guacamole/proxy-clients/vnc/src/vnc_client.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/guacamole/libguac/src/client.c b/guacamole/libguac/src/client.c
index d6fd6658b..7ac1bd451 100644
--- a/guacamole/libguac/src/client.c
+++ b/guacamole/libguac/src/client.c
@@ -120,6 +120,7 @@ guac_client* guac_get_client(int client_fd) {
                 if (!(client->client_plugin_handle)) {
                     syslog(LOG_ERR, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror());
                     guac_send_error(io, "Could not load server-side client plugin.");
+                    guac_flush(io);
                     guac_free_instruction_data(&instruction);
                     return NULL;
                 }
@@ -132,6 +133,7 @@ guac_client* guac_get_client(int client_fd) {
                 if ((error = dlerror()) != NULL) {
                     syslog(LOG_ERR, "Could not get guac_client_init in plugin: %s\n", error);
                     guac_send_error(io, "Invalid server-side client plugin.");
+                    guac_flush(io);
                     guac_free_instruction_data(&instruction);
                     return NULL;
                 }
@@ -141,8 +143,8 @@ guac_client* guac_get_client(int client_fd) {
                 argv = instruction.argv;
 
                 if (alias.client_init(client, argc, argv) != 0) {
+                    /* NOTE: On error, proxy client will send appropriate error message */
                     guac_free_instruction_data(&instruction);
-                    guac_send_error(io, "Error initializing server-side client.");
                     return NULL;
                 }
 
diff --git a/guacamole/proxy-clients/vnc/src/vnc_client.c b/guacamole/proxy-clients/vnc/src/vnc_client.c
index 88c2bf91f..1faf25c3d 100644
--- a/guacamole/proxy-clients/vnc/src/vnc_client.c
+++ b/guacamole/proxy-clients/vnc/src/vnc_client.c
@@ -297,6 +297,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
 
     if (argc < 3) {
         guac_send_error(client->io, "VNC client requires hostname and port arguments");
+        guac_flush(client->io);
         return 1;
     }
 
@@ -330,6 +331,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     /* Connect */
     if (!rfbInitClient(rfb_client, NULL, NULL)) {
         guac_send_error(client->io, "Error initializing VNC client");
+        guac_flush(client->io);
         return 1;
     }