Commit ca249a91 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

wldap32: Rename cert_callback to server_cert_callback.

parent 2e5a8595
...@@ -250,7 +250,7 @@ exit: ...@@ -250,7 +250,7 @@ exit:
*/ */
ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) 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; int ret;
TRACE( "(%p, %p)\n", ld, timeout ); TRACE( "(%p, %p)\n", ld, timeout );
...@@ -261,7 +261,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *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 (timeout && (timeout->tv_sec || timeout->tv_usec)) FIXME( "ignoring timeout\n" );
if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret ); if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret );
if (cert_callback) if (server_cert_callback)
{ {
CtxtHandle *tls_context; CtxtHandle *tls_context;
const CERT_CONTEXT *cert; const CERT_CONTEXT *cert;
...@@ -271,7 +271,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) ...@@ -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 (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" ); TRACE( "accepted\n" );
} }
......
...@@ -545,7 +545,7 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) ...@@ -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 ) ); return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) );
case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE: case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE:
CERT_CALLBACK(ld) = value; SERVER_CERT_CALLBACK(ld) = value;
return WLDAP32_LDAP_SUCCESS; return WLDAP32_LDAP_SUCCESS;
case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DEREF:
......
...@@ -228,14 +228,14 @@ struct private_data ...@@ -228,14 +228,14 @@ struct private_data
{ {
LDAP *ctx; LDAP *ctx;
struct berval **server_ctrls; struct berval **server_ctrls;
VERIFYSERVERCERT *cert_callback; VERIFYSERVERCERT *server_cert_callback;
BOOL connected; BOOL connected;
}; };
C_ASSERT(sizeof(struct private_data) < FIELD_OFFSET(struct ld_sb, sb_naddr) - FIELD_OFFSET(struct ld_sb, Reserved1)); 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 CTX(ld) (((struct private_data *)ld->ld_sb.Reserved1)->ctx)
#define SERVER_CTRLS(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_ctrls) #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 CONNECTED(ld) (((struct private_data *)ld->ld_sb.Reserved1)->connected)
#define MSG(entry) (entry->Request) #define MSG(entry) (entry->Request)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment