summaryrefslogtreecommitdiffstats
path: root/libfreerdp/core/smartcardlogon.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:25:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:25:12 +0000
commit827a4c3faa27e0c186452585b15094eee1119085 (patch)
treee6a08b0c767863d66f7d4a9de80db5edc7db29be /libfreerdp/core/smartcardlogon.c
parentReleasing progress-linux version 3.3.0+dfsg1-1~progress7.99u1. (diff)
downloadfreerdp3-827a4c3faa27e0c186452585b15094eee1119085.tar.xz
freerdp3-827a4c3faa27e0c186452585b15094eee1119085.zip
Merging upstream version 3.5.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libfreerdp/core/smartcardlogon.c')
-rw-r--r--libfreerdp/core/smartcardlogon.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c
index d5907cf..f3f5581 100644
--- a/libfreerdp/core/smartcardlogon.c
+++ b/libfreerdp/core/smartcardlogon.c
@@ -222,11 +222,14 @@ static BOOL set_info_certificate(SmartcardCertInfo* cert, BYTE* certBytes, DWORD
return FALSE;
}
- if (userFilter && cert->userHint && strcmp(cert->userHint, userFilter) != 0)
+ if (userFilter && (!cert->upn || (strcmp(cert->upn, userFilter) != 0)))
{
- WLog_DBG(TAG, "discarding non matching cert by user %s@%s", cert->userHint,
- cert->domainHint);
- return FALSE;
+ if (cert->userHint && strcmp(cert->userHint, userFilter) != 0)
+ {
+ WLog_DBG(TAG, "discarding non matching cert by user %s@%s", cert->userHint,
+ cert->domainHint);
+ return FALSE;
+ }
}
if (domainFilter && cert->domainHint && strcmp(cert->domainHint, domainFilter) != 0)