wldap32: Move support for compare functions to the Unix library.

Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wldap32: Move support for compare functions to the Unix library.
e32a6026 · Hans Leidekker · Alexandre Julliard · db26894e · e32a6026 · e32a6026
Commit e32a6026 authored Apr 14, 2021 by Hans Leidekker Committed by Alexandre Julliard Apr 14, 2021
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 0 deletions

compare.c dlls/wldap32/compare.c +0 -0

libldap.c dlls/wldap32/libldap.c +17 -0

libldap.h dlls/wldap32/libldap.h +8 -0

No files found.
--- a/dlls/wldap32/compare.c
+++ b/dlls/wldap32/compare.c
--- a/dlls/wldap32/libldap.c
+++ b/dlls/wldap32/libldap.c
@@ -309,6 +309,21 @@ int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPC
                           (LDAPControl **)clientctrls );
 }

+int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value,
+                                 LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg )
+{
+    int dummy;
+    return ldap_compare_ext( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value,
+                             (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy );
+}
+
+int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value,
+                                   LDAPControlU **serverctrls, LDAPControlU **clientctrls )
+{
+    return ldap_compare_ext_s( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value,
+                               (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
+}
+
 void CDECL wrap_ldap_memfree( void *ptr )
 {
    return ldap_memfree( ptr );
@@ -375,6 +390,8 @@ static const struct ldap_funcs funcs =
    wrap_ber_scanf,
    wrap_ldap_add_ext,
    wrap_ldap_add_ext_s,
+    wrap_ldap_compare_ext,
+    wrap_ldap_compare_ext_s,
    wrap_ldap_memfree,
    wrap_ldap_sasl_bind,
    wrap_ldap_sasl_bind_s,

--- a/dlls/wldap32/libldap.h
+++ b/dlls/wldap32/libldap.h
@@ -94,6 +94,10 @@ extern int CDECL wrap_ldap_add_ext(void *, const char *, LDAPModU **, LDAPContro
                                   ULONG *) DECLSPEC_HIDDEN;
 extern int CDECL wrap_ldap_add_ext_s(void *, const char *, LDAPModU **, LDAPControlU **,
                                     LDAPControlU **) DECLSPEC_HIDDEN;
+extern int CDECL wrap_ldap_compare_ext(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
+                                       LDAPControlU **, ULONG *) DECLSPEC_HIDDEN;
+extern int CDECL wrap_ldap_compare_ext_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
+                                         LDAPControlU **) DECLSPEC_HIDDEN;
 extern void CDECL wrap_ldap_memfree(void *) DECLSPEC_HIDDEN;
 extern int CDECL wrap_ldap_sasl_bind(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
                                     LDAPControlU **, int *) DECLSPEC_HIDDEN;
@@ -122,6 +126,10 @@ struct ldap_funcs

    int (CDECL *ldap_add_ext)(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, ULONG *);
    int (CDECL *ldap_add_ext_s)(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **);
+    int (CDECL *ldap_compare_ext)(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
+                                  LDAPControlU **, ULONG *);
+    int (CDECL *ldap_compare_ext_s)(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
+                                    LDAPControlU **);
    void (CDECL *ldap_memfree)(void *);
    int (CDECL *ldap_sasl_bind)(void *, const char *, const char *, struct bervalU *, LDAPControlU **, LDAPControlU **,
                                int *);