From fa043b06ba28388aa0b5f11f81a3f4948bcf746e Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Tue, 2 Aug 2005 09:49:41 +0000 Subject: [PATCH] Don't rely on ldap structure when headers are not available. --- dlls/wldap32/compare.c | 12 ++++++------ dlls/wldap32/winldap_private.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index cd408b7e4c5..9428602e6c6 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -115,7 +115,7 @@ exit: } ULONG ldap_compare_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - struct berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, + struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -166,7 +166,7 @@ exit: } ULONG ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, - struct berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, + struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -209,7 +209,7 @@ ULONG ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, if (!clientctrlsU) goto exit; } - ret = ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? data : &berval, + ret = ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct berval *)data : &berval, serverctrlsU, clientctrlsU, (int *)message ); exit: @@ -224,7 +224,7 @@ exit: } ULONG ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - struct berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) + struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -274,7 +274,7 @@ exit: } ULONG ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, - struct berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) + struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -314,7 +314,7 @@ ULONG ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR valu if (!clientctrlsU) goto exit; } - ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", data ? data : &berval, + ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", data ? (struct berval *)data : &berval, serverctrlsU, clientctrlsU ); exit: diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 77228ff5167..f7671434e10 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -122,10 +122,10 @@ ULONG ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG); ULONG ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); ULONG ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*); +ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*); +ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); ULONG ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); PCHAR ldap_err2stringA(ULONG);