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@baikal.ru --- 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 fd081876eb..4b66cd611f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1338,7 +1338,6 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, case ADSTYPE_CASE_IGNORE_STRING: case ADSTYPE_PRINTABLE_STRING: case ADSTYPE_OBJECT_CLASS: - 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"))
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=68442
Your paranoid android.
=== debiant (build log) ===
error: patch failed: dlls/adsldp/adsldp.c:1338 Task: Patch failed to apply
=== debiant (build log) ===
error: patch failed: dlls/adsldp/adsldp.c:1338 Task: Patch failed to apply
-
Dmitry Timoshkov -
Marvin