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
64c89517
Commit
64c89517
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kerberos: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a1846242
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
krb5_ap.c
dlls/kerberos/krb5_ap.c
+7
-8
No files found.
dlls/kerberos/krb5_ap.c
View file @
64c89517
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
#include "ntsecpkg.h"
#include "ntsecpkg.h"
#include "winternl.h"
#include "winternl.h"
#include "wine/heap.h"
#include "wine/heap.h"
#include "wine/library.h"
#include "wine/debug.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/unicode.h"
...
@@ -119,14 +118,14 @@ MAKE_FUNCPTR(krb5_unparse_name_flags);
...
@@ -119,14 +118,14 @@ MAKE_FUNCPTR(krb5_unparse_name_flags);
static
void
load_krb5
(
void
)
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
);
WARN
(
"Failed to load %s, Kerberos support will be disabled
\n
"
,
SONAME_LIBKRB5
);
return
;
return
;
}
}
#define LOAD_FUNCPTR(f) \
#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); \
ERR("Failed to load %s\n", #f); \
goto fail; \
goto fail; \
...
@@ -161,7 +160,7 @@ static void load_krb5(void)
...
@@ -161,7 +160,7 @@ static void load_krb5(void)
return
;
return
;
fail:
fail:
wine_dlclose
(
libkrb5_handle
,
NULL
,
0
);
dlclose
(
libkrb5_handle
);
libkrb5_handle
=
NULL
;
libkrb5_handle
=
NULL
;
}
}
...
@@ -623,14 +622,14 @@ MAKE_FUNCPTR(gss_wrap_iov);
...
@@ -623,14 +622,14 @@ MAKE_FUNCPTR(gss_wrap_iov);
static
BOOL
load_gssapi_krb5
(
void
)
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
"
);
ERR_
(
winediag
)(
"Failed to load libgssapi_krb5, Kerberos SSP support will not be available.
\n
"
);
return
FALSE
;
return
FALSE
;
}
}
#define LOAD_FUNCPTR(f) \
#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 ); \
ERR( "Failed to load %s\n", #f ); \
goto fail; \
goto fail; \
...
@@ -658,14 +657,14 @@ static BOOL load_gssapi_krb5(void)
...
@@ -658,14 +657,14 @@ static BOOL load_gssapi_krb5(void)
return
TRUE
;
return
TRUE
;
fail:
fail:
wine_dlclose
(
libgssapi_krb5_handle
,
NULL
,
0
);
dlclose
(
libgssapi_krb5_handle
);
libgssapi_krb5_handle
=
NULL
;
libgssapi_krb5_handle
=
NULL
;
return
FALSE
;
return
FALSE
;
}
}
static
void
unload_gssapi_krb5
(
void
)
static
void
unload_gssapi_krb5
(
void
)
{
{
wine_dlclose
(
libgssapi_krb5_handle
,
NULL
,
0
);
dlclose
(
libgssapi_krb5_handle
);
libgssapi_krb5_handle
=
NULL
;
libgssapi_krb5_handle
=
NULL
;
}
}
...
...
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