From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/init.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 28792cb1513..fe83f3b511c 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -330,12 +330,15 @@ LDAP * CDECL ldap_initA( const PCHAR hostname, ULONG portnumber ) LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) { LDAP *ld = NULL; - char *hostnameU, *url = NULL; + char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; - if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; + if (hostname) + { + if (!(hostnameU = strWtoU( hostname ))) return NULL; + if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; + } ld = create_context( url ); if (ld) ld->ld_host = strUtoW( hostnameU ); @@ -370,12 +373,15 @@ LDAP * CDECL ldap_openA( char *hostname, ULONG portnumber ) LDAP * CDECL ldap_openW( WCHAR *hostname, ULONG portnumber ) { LDAP *ld = NULL; - char *hostnameU, *url = NULL; + char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; - if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; + if (hostname) + { + if (!(hostnameU = strWtoU( hostname ))) return NULL; + if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; + } ld = create_context( url ); if (ld) ld->ld_host = strUtoW( hostnameU ); @@ -410,17 +416,20 @@ LDAP * CDECL ldap_sslinitA( char *hostname, ULONG portnumber, int secure ) LDAP * CDECL ldap_sslinitW( WCHAR *hostname, ULONG portnumber, int secure ) { LDAP *ld = NULL; - char *hostnameU, *url = NULL; + char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %lu, %d)\n", debugstr_w(hostname), portnumber, secure ); - if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; + if (hostname) + { + if (!(hostnameU = strWtoU( hostname ))) return NULL; - if (secure) - url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); - else - url = urlify_hostnames( "ldap://", hostnameU, portnumber ); - if (!url) goto exit; + if (secure) + url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); + else + url = urlify_hostnames( "ldap://", hostnameU, portnumber ); + if (!url) goto exit; + } ld = create_context( url ); if (ld) ld->ld_host = strUtoW( hostnameU ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7235