Alexandre Julliard : kerberos: Use standard dlopen() instead of the libwine wrappers.
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:21 CDT 2020
Module: wine
Branch: master
Commit: 64c89517250330618fddb4db75b1a84917cc0125
URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c89517250330618fddb4db75b1a84917cc0125
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:47:19 2020 +0200
kerberos: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kerberos/krb5_ap.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c
index f426290673..44d6b86e01 100644
--- a/dlls/kerberos/krb5_ap.c
+++ b/dlls/kerberos/krb5_ap.c
@@ -44,7 +44,6 @@
#include "ntsecpkg.h"
#include "winternl.h"
#include "wine/heap.h"
-#include "wine/library.h"
#include "wine/debug.h"
#include "wine/unicode.h"
@@ -119,14 +118,14 @@ MAKE_FUNCPTR(krb5_unparse_name_flags);
static void load_krb5(void)
{
- if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0)))
+ if (!(libkrb5_handle = dlopen(SONAME_LIBKRB5, RTLD_NOW)))
{
WARN("Failed to load %s, Kerberos support will be disabled\n", SONAME_LIBKRB5);
return;
}
#define LOAD_FUNCPTR(f) \
- if (!(p_##f = wine_dlsym(libkrb5_handle, #f, NULL, 0))) \
+ if (!(p_##f = dlsym(libkrb5_handle, #f))) \
{ \
ERR("Failed to load %s\n", #f); \
goto fail; \
@@ -161,7 +160,7 @@ static void load_krb5(void)
return;
fail:
- wine_dlclose(libkrb5_handle, NULL, 0);
+ dlclose(libkrb5_handle);
libkrb5_handle = NULL;
}
@@ -623,14 +622,14 @@ MAKE_FUNCPTR(gss_wrap_iov);
static BOOL load_gssapi_krb5(void)
{
- if (!(libgssapi_krb5_handle = wine_dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW, NULL, 0 )))
+ if (!(libgssapi_krb5_handle = dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW )))
{
ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" );
return FALSE;
}
#define LOAD_FUNCPTR(f) \
- if (!(p##f = wine_dlsym( libgssapi_krb5_handle, #f, NULL, 0 ))) \
+ if (!(p##f = dlsym( libgssapi_krb5_handle, #f ))) \
{ \
ERR( "Failed to load %s\n", #f ); \
goto fail; \
@@ -658,14 +657,14 @@ static BOOL load_gssapi_krb5(void)
return TRUE;
fail:
- wine_dlclose( libgssapi_krb5_handle, NULL, 0 );
+ dlclose( libgssapi_krb5_handle );
libgssapi_krb5_handle = NULL;
return FALSE;
}
static void unload_gssapi_krb5(void)
{
- wine_dlclose( libgssapi_krb5_handle, NULL, 0 );
+ dlclose( libgssapi_krb5_handle );
libgssapi_krb5_handle = NULL;
}
More information about the wine-cvs
mailing list