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

[client,sdl] propagate error from auth dialog

Browse Source
This commit is contained in:
st0ne77
2023-12-15 10:09:04 +08:00
committed by akallabeth
parent f791cf6308
commit 8dc01cebb0
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/SDL/dialogs/sdl_dialogs.cpp
View File

@@ -116,7 +116,7 @@ BOOL sdl_authenticate_ex(freerdp* instance, char** username, char** password, ch
{
SDL_UserAuthArg* arg = reinterpret_cast<SDL_UserAuthArg*>(event.padding);
res = arg->result != 0 ? TRUE : FALSE;
res = arg->result > 0 ? TRUE : FALSE;
free(*username);
free(*domain);
@@ -516,11 +516,19 @@ BOOL sdl_auth_dialog_show(const SDL_UserAuthArg* args)
rc = ilist.run(result);
}
if ((rc <= 0) || (result.size() < prompt.size()))
return FALSE;
if ((result.size() < prompt.size()))
rc = -1;
return sdl_push_user_event(SDL_USEREVENT_AUTH_RESULT, _strdup(result[0].c_str()),
_strdup(result[1].c_str()), _strdup(result[2].c_str()), rc);
char* user = nullptr;
char* domain = nullptr;
char* pwd = nullptr;
if (rc > 0)
{
user = _strdup(result[0].c_str());
domain = _strdup(result[1].c_str());
pwd = _strdup(result[2].c_str());
}
return sdl_push_user_event(SDL_USEREVENT_AUTH_RESULT, user, domain, pwd, rc);
}
BOOL sdl_scard_dialog_show(const char* title, Sint32 count, const char** list)