Kroker 用ブランチ

Dockerfile

@@ -39,7 +39,7 @@ RUN apk add --no-cache                \
         libtool                       \
         libwebp-dev                   \
         make                          \
-        openssl1.1-compat-dev         \
+        openssl-dev                   \
         pango-dev                     \
         pulseaudio-dev                \
         util-linux-dev

bin/guacctl

@@ -117,7 +117,7 @@ error() {
 ##
 usage() {
     cat >&2 <<END
-guacctl 1.5.3, Apache Guacamole terminal session control utility.
+guacctl 1.5.3-fp.2, Apache Guacamole terminal session control utility.
 Usage: guacctl [OPTION] [FILE or NAME]...
 
     -d, --download         download each of the files listed.

configure.ac

@@ -18,7 +18,7 @@
 #
 
 AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [1.5.3])
+AC_INIT([guacamole-server], [1.5.3-fp.2])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])

src/common-ssh/sftp.c

@@ -472,7 +472,7 @@ static int guac_common_ssh_sftp_ack_handler(guac_user* user,
     if (status == GUAC_PROTOCOL_STATUS_SUCCESS) {
 
         /* Attempt read into buffer */
-        char buffer[4096];
+        char buffer[1024*64];
         int bytes_read = libssh2_sftp_read(file, buffer, sizeof(buffer)); 
 
         /* If bytes read, send as blob */
@@ -515,9 +515,16 @@ static int guac_common_ssh_sftp_ack_handler(guac_user* user,
     }
 
     /* Otherwise, return stream to user */
-    else
+    else {
         guac_user_free_stream(user, stream);
 
+        /* Close file */
+        if (libssh2_sftp_close(file) == 0)
+            guac_user_log(user, GUAC_LOG_DEBUG, "File closed");
+        else
+            guac_user_log(user, GUAC_LOG_INFO, "Unable to close file");
+    }
+
     return 0;
 }
 

src/protocols/telnet/telnet.c

@@ -53,6 +53,7 @@ static const telnet_telopt_t __telnet_options[] = {
     { TELNET_TELOPT_MSSP,        TELNET_WONT, TELNET_DO   },
     { TELNET_TELOPT_NAWS,        TELNET_WILL, TELNET_DONT },
     { TELNET_TELOPT_NEW_ENVIRON, TELNET_WILL, TELNET_DONT },
+    { TELNET_TELOPT_SGA,         TELNET_WILL, TELNET_DO   },
     { -1, 0, 0 }
 };