[PATCH 1/2] wldap32: Rename cert_callback to server_cert_callback.

[Alex Henrie]

From: Alex Henrie

---
 dlls/wldap32/init.c            | 6 +++---
 dlls/wldap32/option.c          | 2 +-
 dlls/wldap32/winldap_private.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
index c5b11a4de28..47063122b04 100644
--- a/dlls/wldap32/init.c
+++ b/dlls/wldap32/init.c
@@ -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" );
             }
diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c
index cc416389276..57e74b5b2d2 100644
--- a/dlls/wldap32/option.c
+++ b/dlls/wldap32/option.c
@@ -499,7 +499,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:
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index ce9a7cc3fa8..3393c031007 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -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)