system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wldap32: Rename cert_callback to server_cert_callback.

Browse source
This commit is contained in:
Alex Henrie 2023-09-01 19:40:26 -06:00 committed by Alexandre Julliard
parent 2e5a8595ed
commit ca249a915d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/wldap32/init.c
View file

@ -250,7 +250,7 @@ exit:
*/
ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout )
{
VERIFYSERVERCERT *cert_callback = CERT_CALLBACK(ld);
VERIFYSERVERCERT *server_cert_callback = SERVER_CERT_CALLBACK(ld);
int ret;
TRACE( "(%p, %p)\n", ld, timeout );
@ -261,7 +261,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout )
if (timeout && (timeout->tv_sec || timeout->tv_usec)) FIXME( "ignoring timeout\n" );
if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret );
if (cert_callback)
if (server_cert_callback)
{
CtxtHandle *tls_context;
const CERT_CONTEXT *cert;
@ -271,7 +271,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout )
if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) == SEC_E_OK)
{
if (cert_callback( ld, &cert ))
if (server_cert_callback( ld, &cert ))
{
TRACE( "accepted\n" );
}

2
dlls/wldap32/option.c
View file

@ -545,7 +545,7 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value )
return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) );
case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
CERT_CALLBACK(ld) = value;
SERVER_CERT_CALLBACK(ld) = value;
return WLDAP32_LDAP_SUCCESS;
case WLDAP32_LDAP_OPT_DEREF:

4
dlls/wldap32/winldap_private.h
View file

@ -228,14 +228,14 @@ struct private_data
{
LDAP *ctx;
struct berval **server_ctrls;
VERIFYSERVERCERT *cert_callback;
VERIFYSERVERCERT *server_cert_callback;
BOOL connected;
};
C_ASSERT(sizeof(struct private_data) < FIELD_OFFSET(struct ld_sb, sb_naddr) - FIELD_OFFSET(struct ld_sb, Reserved1));
#define CTX(ld) (((struct private_data *)ld->ld_sb.Reserved1)->ctx)
#define SERVER_CTRLS(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_ctrls)
#define CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->cert_callback)
#define SERVER_CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_cert_callback)
#define CONNECTED(ld) (((struct private_data *)ld->ld_sb.Reserved1)->connected)
#define MSG(entry) (entry->Request)