Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build Docker Image with openssl3 #2

Merged
merged 3 commits into from
Sep 25, 2023
Merged

Build Docker Image with openssl3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded3c1f
Build Docker image with openssl3
yasuda-fp Sep 25, 2023
42a0cc9
Ensure file closing when stream released
yasuda-fp Oct 26, 2022
4ca6676
Bump version numbers to 1.5.3-fp.0
yasuda-fp Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/guacctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ error() {
##
usage() {
cat >&2 <<END
guacctl 1.5.3, Apache Guacamole terminal session control utility.
guacctl 1.5.3-fp.0, Apache Guacamole terminal session control utility.
Usage: guacctl [OPTION] [FILE or NAME]...

-d, --download download each of the files listed.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

AC_PREREQ([2.61])
AC_INIT([guacamole-server], [1.5.3])
AC_INIT([guacamole-server], [1.5.3-fp.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes])
Expand Down
9 changes: 8 additions & 1 deletion src/common-ssh/sftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down