commit 340aef5362ae013ca38e3a8cbe1bfcdf53746775
author Nick Couchman <vnick@apache.org> Sat Apr 13 21:30:57 2019 -0400
committer Nick Couchman <vnick@apache.org> Wed Apr 17 14:41:35 2019 -0400
tree 275ebd152aaebbeb777d7eff0483bd1d085844f8
parent 379fce2d770608911e29fd3ca9bb1b9d9e3e1dbb

GUACAMOLE-422: Update to remove first argument

src/libguac/user-handshake.c

diff --git a/src/libguac/user-handshake.c b/src/libguac/user-handshake.c
index cf96d34..a7805b2 100644
--- a/src/libguac/user-handshake.c
+++ b/src/libguac/user-handshake.c
@@ -234,7 +234,7 @@
 
     guac_socket* socket = user->socket;
     guac_client* client = user->client;
-
+    
     /* Send args */
     if (guac_protocol_send_args(socket, client->args)
             || guac_socket_flush(socket)) {
@@ -286,9 +286,10 @@
     /* Acknowledge connection availability */
     guac_protocol_send_ready(socket, client->connection_id);
     guac_socket_flush(socket);
-
-    /* Attempt join */
-    if (guac_client_add_user(client, user, parser->argc, parser->argv))
+    
+    /* Check return value from join attempt */
+    if (guac_client_add_user(client, user, (parser->argc - 1),
+                parser->argv + 1))
         guac_client_log(client, GUAC_LOG_ERROR, "User \"%s\" could NOT "
                 "join connection \"%s\"", user->user_id, client->connection_id);
 

src/protocols/kubernetes/settings.c

diff --git a/src/protocols/kubernetes/settings.c b/src/protocols/kubernetes/settings.c
index ce7f697..0ae3dc2 100644
--- a/src/protocols/kubernetes/settings.c
+++ b/src/protocols/kubernetes/settings.c
@@ -54,11 +54,6 @@
 };
 
 enum KUBERNETES_ARGS_IDX {
-
-    /**
-     * The protocol version provided to the client.
-     */
-    IDX_PROTOCOL_VERSION,
     
     /**
      * The hostname to connect to. Required.

src/protocols/rdp/rdp_settings.c

diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index f45b3a4..51214a6 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -123,11 +123,6 @@
 };
 
 enum RDP_ARGS_IDX {
-
-    /**
-     * The protocol version sent to the client.
-     */
-    IDX_PROTOCOL_VERSION,
     
     /**
      * The hostname to connect to.

src/protocols/ssh/settings.c

diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index b69ddd6..a0af9f9 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -66,11 +66,6 @@
 };
 
 enum SSH_ARGS_IDX {
-    
-    /**
-     * The protocol version 
-     */
-    IDX_PROTOCOL_VERSION,
 
     /**
      * The hostname to connect to. Required.

src/protocols/telnet/settings.c

diff --git a/src/protocols/telnet/settings.c b/src/protocols/telnet/settings.c
index 9d334df..85b4fb8 100644
--- a/src/protocols/telnet/settings.c
+++ b/src/protocols/telnet/settings.c
@@ -59,11 +59,6 @@
 };
 
 enum TELNET_ARGS_IDX {
-
-    /**
-     * The protocol version provided by the client.
-     */
-    IDX_PROTOCOL_VERSION,
     
     /**
      * The hostname to connect to. Required.

src/protocols/vnc/settings.c

diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index c39aa73..623e668 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -82,11 +82,6 @@
 };
 
 enum VNC_ARGS_IDX {
-
-    /**
-     * The protocol version provided to the client.
-     */
-    IDX_PROTOCOL_VERSION,
     
     /**
      * The hostname of the VNC server (or repeater) to connect to.