This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit ac1975121cfd886e44d8890e960d327bc18ab9e2 Merge: ab23ff7a 3258efe2 Author: Michael Jumper <[email protected]> AuthorDate: Tue Aug 27 23:46:02 2024 -0700 Merge changes from main branch back to next. configure.ac | 4 +++ src/common-ssh/common-ssh/ssh.h | 6 ++++- src/common-ssh/ssh.c | 10 +++++-- src/guacd/daemon.c | 9 +++++++ src/guacd/proc-map.h | 5 ++++ src/libguac/guacamole/socket-tcp.h | 5 +++- src/libguac/guacamole/wol-constants.h | 6 +++++ src/libguac/guacamole/wol.h | 6 ++++- src/libguac/socket-tcp.c | 30 ++++++++++++++++----- src/libguac/wol.c | 6 ++--- src/protocols/rdp/rdp.c | 34 +++++++++++++++++++++--- src/protocols/rdp/settings.c | 39 +++++++++++++++++++++++++++- src/protocols/rdp/settings.h | 26 +++++++++++++++++++ src/protocols/ssh/settings.c | 11 ++++++++ src/protocols/ssh/settings.h | 12 +++++++++ src/protocols/ssh/ssh.c | 49 +++++++++++++++++++---------------- src/protocols/telnet/telnet.c | 5 ++-- src/protocols/vnc/settings.c | 25 ++++++++++++++++++ src/protocols/vnc/settings.h | 16 ++++++++++++ src/protocols/vnc/vnc.c | 34 +++++++++++++++++++++--- 20 files changed, 292 insertions(+), 46 deletions(-)
