Module: wine Branch: master Commit: 5a6c8359c92d3fa402b7bb711ca07bcd125122d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6c8359c92d3fa402b7bb711... Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:58 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.15 to ADSTYPE_CASE_IGNORE_STRING. According to RFC4517 1.3.6.1.4.1.1466.115.121.1.15 is a Directory string which should map to one of TeletextString, PrintableString or UniversalString. Something else should map to ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 - dlls/adsldp/schema.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index d3feb89a05..e27e641eb0 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1337,7 +1337,6 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, case ADSTYPE_CASE_EXACT_STRING: case ADSTYPE_CASE_IGNORE_STRING: case ADSTYPE_PRINTABLE_STRING: - case ADSTYPE_NT_SECURITY_DESCRIPTOR: { DWORD outlen; TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 412902f25e..234a76dfa9 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -61,7 +61,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15")) - return ADSTYPE_NT_SECURITY_DESCRIPTOR; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))