Skip to content

Commit eb58713

Browse files
committed
GUACAMOLE-2210: Add support for AAD authentication to RDP protocol.
1 parent 6719b20 commit eb58713

10 files changed

Lines changed: 1358 additions & 3 deletions

File tree

configure.ac

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,21 @@ then
11851185
[AC_MSG_RESULT([no])])
11861186
fi
11871187

1188+
if test "x${have_freerdp}" = "xyes"
1189+
then
1190+
AC_CHECK_DECLS([FreeRDP_AadSecurity],
1191+
[have_freerdp_aad=yes], [have_freerdp_aad=no],
1192+
[#include <freerdp/settings.h>])
1193+
1194+
if test "x${have_freerdp_aad}" = "xyes"
1195+
then
1196+
PKG_CHECK_MODULES([CURL], [libcurl],
1197+
[AC_DEFINE([HAVE_FREERDP_AAD_SUPPORT],,
1198+
[Defined if FreeRDP supports Azure AD authentication and libcurl is available])],
1199+
[AC_MSG_WARN([libcurl not found - Azure AD authentication disabled])])
1200+
fi
1201+
fi
1202+
11881203
# Restore CPPFLAGS, removing FreeRDP-specific options needed for testing
11891204
CPPFLAGS="$OLDCPPFLAGS"
11901205

src/protocols/rdp/Makefile.am

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ nodist_libguac_client_rdp_la_SOURCES = \
4040
_generated_keymaps.c
4141

4242
libguac_client_rdp_la_SOURCES = \
43+
aad.c \
4344
argv.c \
4445
beep.c \
4546
channels/audio-input/audio-buffer.c \
@@ -86,6 +87,7 @@ libguac_client_rdp_la_SOURCES = \
8687
user.c
8788

8889
noinst_HEADERS = \
90+
aad.h \
8991
argv.h \
9092
beep.h \
9193
channels/audio-input/audio-buffer.h \
@@ -143,7 +145,8 @@ libguac_client_rdp_la_LDFLAGS = \
143145
-version-info 0:0:0 \
144146
@CAIRO_LIBS@ \
145147
@PTHREAD_LIBS@ \
146-
@RDP_LIBS@
148+
@RDP_LIBS@ \
149+
@CURL_LIBS@
147150

148151
libguac_client_rdp_la_LIBADD = \
149152
@COMMON_LTLIB@ \

0 commit comments

Comments
 (0)