[PATCH 0/1] MR2481: wldap32: Handle null DN or null message in ldap_delete* and add tests.

[Alex Henrie (＠alexhenrie)]

On Windows, ldap_delete_(ext_)s returns LDAP_UNWILLING_TO_PERFORM when
trying to delete an entry that cannot be deleted. On Unix,
LDAP_SERVER_DOWN is returned instead. Unix also returns LDAP_SERVER_DOWN
immediately from ldap_delete_ext if the entry cannot be deleted, whereas
Windows queues an asynchronous operation and returns LDAP_SUCCESS.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702

[PATCH 1/1] wldap32: Handle null DN or null message in ldap_delete* and add tests.

[Alex Henrie]

From: Alex Henrie

On Windows, ldap_delete_(ext_)s returns LDAP_UNWILLING_TO_PERFORM when
trying to delete an entry that cannot be deleted. On Unix,
LDAP_SERVER_DOWN is returned instead. Unix also returns LDAP_SERVER_DOWN
immediately from ldap_delete_ext if the entry cannot be deleted, whereas
Windows queues an asynchronous operation and returns LDAP_SUCCESS.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702
---
 dlls/wldap32/delete.c      |  8 +++---
 dlls/wldap32/tests/parse.c | 50 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c
index b085142d83d..8539b7266eb 100644
--- a/dlls/wldap32/delete.c
+++ b/dlls/wldap32/delete.c
@@ -72,7 +72,7 @@ ULONG CDECL ldap_delete_extA( LDAP *ld, char *dn, LDAPControlA **serverctrls, LD

TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_a(dn), serverctrls, clientctrls, message );

-    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR;

if (dn && !(dnW = strAtoW( dn ))) goto exit;
     if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit;
@@ -99,9 +99,9 @@ ULONG CDECL ldap_delete_extW( LDAP *ld, WCHAR *dn, LDAPControlW **serverctrls, L

TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_w(dn), serverctrls, clientctrls, message );

-    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR;

-    if (dn && !(dnU = strWtoU( dn ))) goto exit;
+    if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit;
     if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit;
     if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit;
     else
@@ -155,7 +155,7 @@ ULONG CDECL ldap_delete_ext_sW( LDAP *ld, WCHAR *dn, LDAPControlW **serverctrls,

if (!ld) return WLDAP32_LDAP_PARAM_ERROR;

-    if (dn && !(dnU = strWtoU( dn ))) goto exit;
+    if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit;
     if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit;
     if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit;
     else
diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c
index 34fcb9a4201..791a19c45ba 100644
--- a/dlls/wldap32/tests/parse.c
+++ b/dlls/wldap32/tests/parse.c
@@ -367,6 +367,55 @@ static void test_ldap_compare(void)
     ldap_unbind( ld );
 }

+static void test_ldap_delete(void)
+{
+    LDAP *ld;
+    ULONG ret, num;
+
+    ld = ldap_initA( (char *)"db.debian.org", 389 );
+    ok( ld != NULL, "ldap_init failed\n" );
+
+    ret = ldap_deleteA( NULL, NULL );
+    ok( ret == (ULONG)-1, "ldap_deleteA should fail, got %#lx\n", ret );
+    ret = ldap_deleteA( NULL, (char *)"" );
+    ok( ret == (ULONG)-1, "ldap_deleteA should fail, got %#lx\n", ret );
+    ret = ldap_deleteA( ld, NULL );
+    ok( ret != (ULONG)-1, "ldap_deleteA should succeed, got %#lx\n", ret );
+    ret = ldap_deleteA( ld, (char *)"" );
+    ok( ret != (ULONG)-1, "ldap_deleteA should succeed, got %#lx\n", ret );
+
+    ret = ldap_delete_sA( NULL, NULL );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_sA( NULL, (char *)"" );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_sA( ld, NULL );
+    todo_wine ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_delete_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_sA( ld, (char *)"" );
+    todo_wine ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_delete_sA should fail, got %#lx\n", ret );
+
+    ret = ldap_delete_extA( NULL, NULL, NULL, NULL, NULL );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret );
+    ret = ldap_delete_extA( NULL, (char *)"", NULL, NULL, &num );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret );
+    ret = ldap_delete_extA( ld, NULL, NULL, NULL, &num );
+    todo_wine ok( !ret, "ldap_delete_extA should succeed, got %#lx\n", ret );
+    ret = ldap_delete_extA( ld, (char *)"", NULL, NULL, NULL );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret );
+    ret = ldap_delete_extA( ld, (char *)"", NULL, NULL, &num );
+    todo_wine ok( !ret, "ldap_delete_extA should succeed, got %#lx\n", ret );
+
+    ret = ldap_delete_ext_sA( NULL, NULL, NULL, NULL );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_ext_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_ext_sA( NULL, (char *)"", NULL, NULL );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_delete_ext_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_ext_sA( ld, NULL, NULL, NULL );
+    todo_wine ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_delete_ext_sA should fail, got %#lx\n", ret );
+    ret = ldap_delete_ext_sA( ld, (char *)"", NULL, NULL );
+    todo_wine ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_delete_ext_sA should fail, got %#lx\n", ret );
+
+    ldap_unbind( ld );
+}
+
 static void test_ldap_server_control( void )
 {
     /* SEQUENCE  { INTEGER :: 0x07 } */
@@ -492,6 +541,7 @@ START_TEST (parse)
     test_ldap_add();
     test_ldap_modify();
     test_ldap_compare();
+    test_ldap_delete();

ld = ldap_initA( (char *)"db.debian.org", 389 );
     ok( ld != NULL, "ldap_init failed\n" );

[PATCH 1/1] wldap32: Handle null DN or null message in ldap_delete* and add tests.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=130958

Your paranoid android.

=== debian11 (32 bit ar:MA report) ===

wldap32:
parse.c:392: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:394: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:401: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:405: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:412: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35
parse.c:414: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35

=== debian11 (32 bit hi:IN report) ===

wldap32:
parse.c:392: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:394: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:401: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:405: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:412: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35
parse.c:414: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35

=== debian11 (32 bit ja:JP report) ===

wldap32:
parse.c:392: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:394: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:401: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:405: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:412: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35
parse.c:414: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35

=== debian11 (32 bit zh:CN report) ===

wldap32:
parse.c:392: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:394: Test succeeded inside todo block: ldap_delete_sA should fail, got 0x35
parse.c:401: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:405: Test succeeded inside todo block: ldap_delete_extA should succeed, got 0
parse.c:412: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35
parse.c:414: Test succeeded inside todo block: ldap_delete_ext_sA should fail, got 0x35