Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch DirectoryControl to use AsnWriter, AsnDecoder #101512

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Switch DirectoryControl to use AsnWriter, AsnDecoder #101512

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9b87b4e
Removed BerConverter.Decode usage
edwardneal Apr 21, 2024
31600a4
Removed BerConverter.Encode usage
edwardneal Apr 23, 2024
a152c84
Regression in CrossDomainMoveControl
edwardneal Apr 23, 2024
9461057
Correcting test values
edwardneal Apr 23, 2024
cb07eb4
Removed SortKeyInterop from .csproj
edwardneal Apr 23, 2024
73dd1bc
Small optimisations
edwardneal Apr 23, 2024
c5c9598
AD compatibility test corrections
edwardneal Apr 24, 2024
33e4f25
Performance improvement, bugfix
edwardneal Apr 27, 2024
6b487c2
Following code review
edwardneal May 11, 2024
b4bbdc7
Implemented further code review comments
edwardneal May 24, 2024
e12d447
Remainder of code review feedback
edwardneal May 25, 2024
57fc5f6
First response to code review feedback
edwardneal Jul 24, 2024
f1aca42
Further code review changes
edwardneal Jul 26, 2024
2a6915b
Merge remote-tracking branch 'upstream/main' into issue-97540
edwardneal Sep 30, 2024
96790e0
Update tests from PR107201
edwardneal Oct 1, 2024
a215542
Tightened validation based on updated tests
edwardneal Oct 1, 2024
2d87369
Eliminated OS-specific test condition
edwardneal Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,6 @@ internal static partial int ldap_sasl_interactive_bind(
[LibraryImport(Libraries.OpenLdap, EntryPoint = "ldap_first_reference")]
public static partial IntPtr ldap_first_reference(ConnectionHandle ldapHandle, IntPtr result);

[LibraryImport(Libraries.OpenLdap, EntryPoint = "ldap_create_sort_control")]
public static partial int ldap_create_sort_control(ConnectionHandle handle, IntPtr keys, byte critical, ref IntPtr control);

[LibraryImport(Libraries.OpenLdap, EntryPoint = "ldap_control_free")]
public static partial int ldap_control_free(IntPtr control);

Expand Down
4 changes: 0 additions & 4 deletions src/libraries/Common/src/Interop/Windows/Wldap32/Interop.Ldap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,6 @@ internal static partial class Ldap
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
public static partial int ldap_parse_reference(ConnectionHandle ldapHandle, IntPtr result, ref IntPtr referrals);

[LibraryImport(Libraries.Wldap32, EntryPoint = "ldap_create_sort_controlW")]
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
public static partial int ldap_create_sort_control(ConnectionHandle handle, IntPtr keys, byte critical, ref IntPtr control);

[LibraryImport(Libraries.Wldap32, EntryPoint = "ldap_control_freeW")]
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
public static partial int ldap_control_free(IntPtr control);
Expand Down
3 changes: 0 additions & 3 deletions ...ibraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapPartialResultsProcessor.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapSessionOptions.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\SafeHandles.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\SortKeyInterop.cs" />

<Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" />
<Compile Include="$(CommonPath)Interop\Interop.Ldap.cs" Link="Common\Interop\Interop.Ldap.cs" />
Expand All @@ -64,7 +63,6 @@
<Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\LdapPal.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\BerPal.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\SortKeyInterop.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapConnection.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapSessionOptions.Windows.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\SafeHandles.Windows.cs" />
Expand All @@ -79,7 +77,6 @@
<Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\LdapPal.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\BerPal.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\Interop\SortKeyInterop.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapConnection.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LdapSessionOptions.Linux.cs" />
<Compile Include="System\DirectoryServices\Protocols\ldap\LocalAppContextSwitches.cs" />
Expand Down
2 changes: 0 additions & 2 deletions ...rectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ internal static int CompareDirectoryEntries(ConnectionHandle ldapHandle, string

internal static void FreeDirectoryControls(IntPtr value) => Interop.Ldap.ldap_controls_free(value);

internal static int CreateDirectorySortControl(ConnectionHandle handle, IntPtr keys, byte critical, ref IntPtr control) => Interop.Ldap.ldap_create_sort_control(handle, keys, critical, ref control);

internal static int DeleteDirectoryEntry(ConnectionHandle ldapHandle, string dn, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) => Interop.Ldap.ldap_delete_ext(ldapHandle, dn, servercontrol, clientcontrol, ref messageNumber);

internal static int ExtendedDirectoryOperation(ConnectionHandle ldapHandle, string oid, BerVal data, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) =>
Expand Down
2 changes: 0 additions & 2 deletions ...ctoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ internal static int CompareDirectoryEntries(ConnectionHandle ldapHandle, string

internal static void FreeDirectoryControls(IntPtr value) => Interop.Ldap.ldap_controls_free(value);

internal static int CreateDirectorySortControl(ConnectionHandle handle, IntPtr keys, byte critical, ref IntPtr control) => Interop.Ldap.ldap_create_sort_control(handle, keys, critical, ref control);

internal static int DeleteDirectoryEntry(ConnectionHandle ldapHandle, string dn, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) => Interop.Ldap.ldap_delete_ext(ldapHandle, dn, servercontrol, clientcontrol, ref messageNumber);

internal static int ExtendedDirectoryOperation(ConnectionHandle ldapHandle, string oid, BerVal data, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) =>
Expand Down
18 changes: 0 additions & 18 deletions ...Services.Protocols/src/System/DirectoryServices/Protocols/Interop/SortKeyInterop.Linux.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions ...rvices.Protocols/src/System/DirectoryServices/Protocols/Interop/SortKeyInterop.Windows.cs
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions ...ectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/SortKeyInterop.cs
View file
Open in desktop

This file was deleted.

Loading
Loading