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

GUACAMOLE-1658: Remove reference to non-existing ssh_key header. #467

Draft
wants to merge 2 commits into
base: staging/1.6.0
Choose a base branch
from
Draft

GUACAMOLE-1658: Remove reference to non-existing ssh_key header. #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc5b3f
GUACAMOLE-1658: Remove reference to non-existing ssh_key header.
necouchman Oct 29, 2023
0e5cfb2
GUACAMOLE-1658: Rework autoconf rules for SSH agent detection.
necouchman Jun 4, 2024
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
21 changes: 9 additions & 12 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,11 +1067,6 @@ AC_ARG_WITH([ssh],
[],
[with_ssh=check])

AC_ARG_ENABLE(ssh_agent,
[AS_HELP_STRING([--enable-ssh-agent],
[enable built-in ssh-agent])
],enable_ssh_agent=yes)

if test "x$with_ssh" != "xno"
then
have_libssh2=yes
Expand Down Expand Up @@ -1119,19 +1114,22 @@ fi
#

have_ssh_agent=no
if test "x${have_libssh2}" = "xyes" -a "x${enable_ssh_agent}" = "xyes"
if test "x${have_libssh2}" = "xyes"
then

AC_CHECK_DECL([libssh2_channel_request_auth_agent],
AC_CHECK_DECL([libssh2_agent_sign],
[have_ssh_agent=yes], [],
[[#include <libssh2.h>]])

if test "x${have_ssh_agent}" = "xno"
then
AC_MSG_ERROR([
AC_MSG_WARN([
--------------------------------------------
Agent forwarding support was requested but no such support was found
in libssh2.
Support for ssh-agent forwarding requires
libssh2 1.11.0 or later, and the version
detected does not meet that requirement.
Support for ssh-agent forwarding will not
be enabled.
--------------------------------------------])
else
AC_DEFINE([ENABLE_SSH_AGENT],,
Expand All @@ -1140,8 +1138,7 @@ then

fi

AM_CONDITIONAL([ENABLE_SSH_AGENT], [test "x${have_ssh_agent}" = "xyes" \
-a "x${enable_ssh_agent}" = "xyes"])
AM_CONDITIONAL([ENABLE_SSH_AGENT], [test "x${have_ssh_agent}" = "xyes"])

#
# libtelnet
Expand Down
2 changes: 0 additions & 2 deletions src/protocols/ssh/ssh_agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

#include "config.h"

#include "ssh_key.h"

/**
* Packet type of an agent identity request.
*/
Expand Down
Loading