morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172 from mfleisz/authfix

Browse Source 
core: correct processing of result from authenticate callback
This commit is contained in:
Marc-André Moreau
2011-10-21 06:38:48 -07:00
parent 488a4161f5 0c25bd4fd0
commit 243e1c21ba
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libfreerdp-core/credssp.c
View File

@@ -72,17 +72,22 @@
* @param credssp
*/
void credssp_ntlmssp_init(rdpCredssp* credssp)
int credssp_ntlmssp_init(rdpCredssp* credssp)
{
freerdp* instance;
NTLMSSP* ntlmssp = credssp->ntlmssp;
rdpSettings* settings = credssp->transport->settings;
instance = (freerdp*) settings->instance;
if (settings->password == NULL)
if (settings->password == NULL || settings->username)
{
IFCALL(instance->Authenticate, instance,
&settings->username, &settings->password, &settings->domain);
if(instance->Authenticate)
{
boolean proceed = instance->Authenticate(instance,
&settings->username, &settings->password, &settings->domain);
if(!proceed)
return 0;
}
}
ntlmssp_set_password(ntlmssp, settings->password);
@@ -103,6 +108,8 @@ void credssp_ntlmssp_init(rdpCredssp* credssp)
ntlmssp_generate_exported_session_key(ntlmssp);
ntlmssp->ntlm_v2 = 0;
return 1;
}
/**
@@ -144,7 +151,8 @@ int credssp_authenticate(rdpCredssp* credssp)
STREAM* s = stream_new(0);
uint8* negoTokenBuffer = (uint8*) xmalloc(2048);
credssp_ntlmssp_init(credssp);
if (credssp_ntlmssp_init(credssp) == 0)
return 0;
if (credssp_get_public_key(credssp) == 0)
return 0;