[PATCH 0/5] MR7177: wldap32: Avoid crashes in interact_callback() if defaults is NULL.

[PATCH 1/5] wldap32: Avoid crashes in interact_callback() if defaults is NULL.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

ldap_bind_sW() already copes with SEC_WINNT_AUTH_IDENTITY_W being NULL.

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/bind.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c
index 55422c82474..f150a4f0c02 100644
--- a/dlls/wldap32/bind.c
+++ b/dlls/wldap32/bind.c
@@ -142,6 +142,8 @@ static int interact_callback( LDAP *ld, unsigned flags, void *defaults, void *sa

TRACE( "%p, %08xlx, %p, %p\n", ld, flags, defaults, sasl_interact );

+    if (!defaults) return 0;
+
     while (ptr && ptr->id != SASL_CB_LIST_END)
     {
         switch (ptr->id)

[PATCH 2/5] wldap32: Add stub for ldap_get_option(LDAP_OPT_GETDSNAME_FLAGS).

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/option.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index 00c08e0108c..fb16d02d51e 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -273,6 +273,15 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value )
         return map_error( ret );
     }

+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    {
+        ULONG *flags = value;
+        if (!flags) return WLDAP32_LDAP_PARAM_ERROR;
+        FIXME( "LDAP_OPT_GETDSNAME_FLAGS: stub\n" );
+        *flags = 0;
+        return WLDAP32_LDAP_SUCCESS;
+    }
+
     case WLDAP32_LDAP_OPT_CACHE_ENABLE:
     case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
     case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
@@ -289,7 +298,6 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value )
     case WLDAP32_LDAP_OPT_ENCRYPT:
     case WLDAP32_LDAP_OPT_ERROR_STRING:
     case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
-    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
     case WLDAP32_LDAP_OPT_HOST_REACHABLE:
     case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
     case WLDAP32_LDAP_OPT_PING_LIMIT:

[PATCH 3/5] wldap32: Add stub for ldap_set_option(LDAP_OPT_GETDSNAME_FLAGS).

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/option.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index fb16d02d51e..aea5859b56a 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -611,6 +611,14 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
         return map_error( ret );
     }

+    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
+    {
+        ULONG *flags = value;
+        if (!flags) return WLDAP32_LDAP_PARAM_ERROR;
+        FIXME( "LDAP_OPT_GETDSNAME_FLAGS: %08lx\n", *flags );
+        return WLDAP32_LDAP_SUCCESS;
+    }
+
     case WLDAP32_LDAP_OPT_CACHE_ENABLE:
     case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
     case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
@@ -635,7 +643,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
     case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME:
     case WLDAP32_LDAP_OPT_ERROR_STRING:
     case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND:
-    case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS:
     case WLDAP32_LDAP_OPT_HOST_REACHABLE:
     case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
     case WLDAP32_LDAP_OPT_PING_LIMIT:

[PATCH 4/5] wldap32: Add stub for ldap_set_option(LDAP_OPT_PROMPT_CREDENTIALS).

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/option.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index aea5859b56a..96235eeb8e0 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -619,6 +619,14 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
         return WLDAP32_LDAP_SUCCESS;
     }

+    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
+    {
+        ULONG *flags = value;
+        if (!flags) return WLDAP32_LDAP_PARAM_ERROR;
+        FIXME( "LDAP_OPT_PROMPT_CREDENTIALS: %08lx\n", *flags );
+        return WLDAP32_LDAP_SUCCESS;
+    }
+
     case WLDAP32_LDAP_OPT_CACHE_ENABLE:
     case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
     case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
@@ -647,7 +655,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
     case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE:
     case WLDAP32_LDAP_OPT_PING_LIMIT:
     case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
-    case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS:
     case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
     case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
     case WLDAP32_LDAP_OPT_SASL_METHOD:

[PATCH 5/5] wldap32: Add stub for ldap_set_option(LDAP_OPT_REFERRAL_CALLBACK).

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/option.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index 96235eeb8e0..3d10385b807 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -627,6 +627,12 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
         return WLDAP32_LDAP_SUCCESS;
     }

+    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
+    {
+        FIXME("LDAP_OPT_REFERRAL_CALLBACK: %p\n", value);
+        return WLDAP32_LDAP_SUCCESS;
+    }
+
     case WLDAP32_LDAP_OPT_CACHE_ENABLE:
     case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
     case WLDAP32_LDAP_OPT_CACHE_STRATEGY:
@@ -656,7 +662,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
     case WLDAP32_LDAP_OPT_PING_LIMIT:
     case WLDAP32_LDAP_OPT_PING_WAIT_TIME:
     case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG:
-    case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK:
     case WLDAP32_LDAP_OPT_SASL_METHOD:
     case WLDAP32_LDAP_OPT_SECURITY_CONTEXT:
     case WLDAP32_LDAP_OPT_SEND_TIMEOUT:

[PATCH 0/5] MR7177: wldap32: Avoid crashes in interact_callback() if defaults is NULL. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.