system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

wldap32: Create version 3 contexts by default.

Browse Source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2017-10-05 10:05:33 +02:00 committed by Alexandre Julliard
parent 8fc6b58df4
commit accdabadba
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wldap32/init.c
View File

@ -206,6 +206,17 @@ static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port )
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
#ifdef HAVE_LDAP
static LDAP *create_context( const char *url )
{
LDAP *ld;
int version = LDAP_VERSION3;
if (ldap_initialize( &ld, url ) != LDAP_SUCCESS) return NULL;
ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
return ld;
}
#endif
/***********************************************************************
* cldap_openA (WLDAP32.@)
*
@ -276,7 +287,7 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber )
url = urlify_hostnames( "cldap://", hostnameU, portnumber );
if (!url) goto exit;
ldap_initialize( &ld, url );
ld = create_context( url );
exit:
strfreeU( hostnameU );
@ -385,7 +396,7 @@ WLDAP32_LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber )
url = urlify_hostnames( "ldap://", hostnameU, portnumber );
if (!url) goto exit;
ldap_initialize( &ld, url );
ld = create_context( url );
exit:
strfreeU( hostnameU );
@ -467,7 +478,7 @@ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber )
url = urlify_hostnames( "ldap://", hostnameU, portnumber );
if (!url) goto exit;
ldap_initialize( &ld, url );
ld = create_context( url );
exit:
strfreeU( hostnameU );

10
dlls/wldap32/tests/parse.c
View File

@ -123,6 +123,15 @@ static void test_ldap_set_optionW( LDAP *ld )
ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret );
}
static void test_ldap_get_optionW( LDAP *ld )
{
ULONG ret, version;
ret = ldap_get_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
ok( !ret, "ldap_get_optionW failed 0x%08x\n", ret );
ok( version == LDAP_VERSION3, "got %u\n", version );
}
START_TEST (parse)
{
LDAP *ld;
@ -132,6 +141,7 @@ START_TEST (parse)
test_ldap_parse_sort_control( ld );
test_ldap_search_extW( ld );
test_ldap_get_optionW( ld );
test_ldap_set_optionW( ld );
ldap_unbind( ld );
}