Skip to content

Commit de377cf

Browse files
committed
GUACAMOLE-2210: Add support for AAD authentication to RDP protocol.
1 parent 5e3e43f commit de377cf

29 files changed

Lines changed: 1443 additions & 4 deletions

configure.ac

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,6 +1156,21 @@ then
11561156
[AC_MSG_RESULT([no])])
11571157
fi
11581158

1159+
if test "x${have_freerdp}" = "xyes"
1160+
then
1161+
AC_CHECK_DECLS([FreeRDP_AadSecurity],
1162+
[have_freerdp_aad=yes], [have_freerdp_aad=no],
1163+
[#include <freerdp/settings.h>])
1164+
1165+
if test "x${have_freerdp_aad}" = "xyes"
1166+
then
1167+
PKG_CHECK_MODULES([CURL], [libcurl],
1168+
[AC_DEFINE([HAVE_FREERDP_AAD_SUPPORT],,
1169+
[Defined if FreeRDP supports Azure AD authentication and libcurl is available])],
1170+
[AC_MSG_WARN([libcurl not found - Azure AD authentication disabled])])
1171+
fi
1172+
fi
1173+
11591174
# Restore CPPFLAGS, removing FreeRDP-specific options needed for testing
11601175
CPPFLAGS="$OLDCPPFLAGS"
11611176

src/protocols/rdp/Makefile.am

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

4040
libguac_client_rdp_la_SOURCES = \
41+
aad.c \
4142
argv.c \
4243
beep.c \
4344
channels/audio-input/audio-buffer.c \
@@ -84,6 +85,7 @@ libguac_client_rdp_la_SOURCES = \
8485
user.c
8586

8687
noinst_HEADERS = \
88+
aad.h \
8789
argv.h \
8890
beep.h \
8991
channels/audio-input/audio-buffer.h \
@@ -141,7 +143,8 @@ libguac_client_rdp_la_LDFLAGS = \
141143
-version-info 0:0:0 \
142144
@CAIRO_LIBS@ \
143145
@PTHREAD_LIBS@ \
144-
@RDP_LIBS@
146+
@RDP_LIBS@ \
147+
@CURL_LIBS@
145148

146149
libguac_client_rdp_la_LIBADD = \
147150
@COMMON_LTLIB@ \

0 commit comments

Comments
 (0)