This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch staging/1.6.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 68f1181955ccad4fd6400e97dd81748296cf2a3f
Merge: 902346a8 5e0ce1db
Author: Mike Jumper <mjum...@apache.org>
AuthorDate: Tue Aug 27 15:43:09 2024 -0700
GUACAMOLE-1290: Merge SFTP support for public keys and corresponding SSH
correction.
src/protocols/rdp/rdp.c | 27 +++++++++++++++++++++++++++
src/protocols/rdp/settings.c | 15 ++++++++++++++-
src/protocols/rdp/settings.h | 5 +++++
src/protocols/ssh/ssh.c | 39 ++++++++++++++++++++-------------------
src/protocols/vnc/settings.c | 13 +++++++++++++
src/protocols/vnc/settings.h | 6 ++++++
src/protocols/vnc/vnc.c | 27 +++++++++++++++++++++++++++
7 files changed, 112 insertions(+), 20 deletions(-)
