kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure that CredSSP is not used for smartcard SSO.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1697 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2013-03-18 11:56:37 +00:00
parent 972832c39f
commit d584b2fa3f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iso.c
View File

@ -23,6 +23,7 @@
extern RD_BOOL g_encryption;
extern RDP_VERSION g_rdp_version;
extern RD_BOOL g_use_password_as_pin;
static RD_BOOL g_negotiate_rdp_protocol = True;
@ -201,10 +202,13 @@ iso_connect(char *server, char *username, char *domain, char *password,
g_negotiate_rdp_protocol = True;
#ifdef WITH_CREDSSP
neg_proto = PROTOCOL_SSL | PROTOCOL_HYBRID;
#else
neg_proto = PROTOCOL_SSL;
#ifdef WITH_CREDSSP
if (!g_use_password_as_pin)
neg_proto |= PROTOCOL_HYBRID;
else
warning("CredSSP will be disabled if smartcard SSO is used.");
#endif
retry:

2
rdesktop.c
View File

@ -101,6 +101,7 @@ RD_BOOL g_lspci_enabled = False;
RD_BOOL g_owncolmap = False;
RD_BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
RD_BOOL g_seamless_rdp = False;
RD_BOOL g_use_password_as_pin = False;
char g_seamless_shell[512];
char g_seamless_spawn_cmd[512];
RD_BOOL g_user_quit = False;
@ -583,6 +584,7 @@ main(int argc, char *argv[])
#ifdef WITH_SCARD
case 'i':
flags |= RDP_LOGON_PASSWORD_IS_SC_PIN;
g_use_password_as_pin = True;
break;
#endif
case 't':