Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ca249a91
Commit
ca249a91
authored
Sep 01, 2023
by
Alex Henrie
Committed by
Alexandre Julliard
Sep 04, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wldap32: Rename cert_callback to server_cert_callback.
parent
2e5a8595
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
init.c
dlls/wldap32/init.c
+3
-3
option.c
dlls/wldap32/option.c
+1
-1
winldap_private.h
dlls/wldap32/winldap_private.h
+2
-2
No files found.
dlls/wldap32/init.c
View file @
ca249a91
...
@@ -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
"
);
}
}
...
...
dlls/wldap32/option.c
View file @
ca249a91
...
@@ -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
:
...
...
dlls/wldap32/winldap_private.h
View file @
ca249a91
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment