Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
fd8c9a94
Commit
fd8c9a94
authored
May 04, 2015
by
Hallvard Furuseth
Committed by
Quanah Gibson-Mount
May 04, 2015
Browse files
Fallback typedef for slap_sasl_cb_ft
parent
03432c5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/sasl.c
View file @
fd8c9a94
...
...
@@ -46,6 +46,12 @@
#define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
(SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP)
#if SASL_VERSION_MINOR >= 0x020119
/* 2.1.25 */
typedef
sasl_callback_ft
slap_sasl_cb_ft
;
#else
typedef
int
(
*
slap_sasl_cb_ft
)();
#endif
static
sasl_security_properties_t
sasl_secprops
;
#elif defined( SLAP_BUILTIN_SASL )
/*
...
...
@@ -1112,8 +1118,8 @@ int slap_sasl_init( void )
#ifdef HAVE_CYRUS_SASL
int
rc
;
static
sasl_callback_t
server_callbacks
[]
=
{
{
SASL_CB_LOG
,
(
s
asl_callback
_ft
)
&
slap_sasl_log
,
NULL
},
{
SASL_CB_GETOPT
,
(
s
asl_callback
_ft
)
&
slap_sasl_getopt
,
NULL
},
{
SASL_CB_LOG
,
(
s
lap_sasl_cb
_ft
)
&
slap_sasl_log
,
NULL
},
{
SASL_CB_GETOPT
,
(
s
lap_sasl_cb
_ft
)
&
slap_sasl_getopt
,
NULL
},
{
SASL_CB_LIST_END
,
NULL
,
NULL
}
};
#endif
...
...
@@ -1257,15 +1263,15 @@ int slap_sasl_open( Connection *conn, int reopen )
conn
->
c_sasl_extra
=
session_callbacks
;
session_callbacks
[
cb
=
0
].
id
=
SASL_CB_LOG
;
session_callbacks
[
cb
].
proc
=
(
s
asl_callback
_ft
)
&
slap_sasl_log
;
session_callbacks
[
cb
].
proc
=
(
s
lap_sasl_cb
_ft
)
&
slap_sasl_log
;
session_callbacks
[
cb
++
].
context
=
conn
;
session_callbacks
[
cb
].
id
=
SASL_CB_PROXY_POLICY
;
session_callbacks
[
cb
].
proc
=
(
s
asl_callback
_ft
)
&
slap_sasl_authorize
;
session_callbacks
[
cb
].
proc
=
(
s
lap_sasl_cb
_ft
)
&
slap_sasl_authorize
;
session_callbacks
[
cb
++
].
context
=
conn
;
session_callbacks
[
cb
].
id
=
SASL_CB_CANON_USER
;
session_callbacks
[
cb
].
proc
=
(
s
asl_callback
_ft
)
&
slap_sasl_canonicalize
;
session_callbacks
[
cb
].
proc
=
(
s
lap_sasl_cb
_ft
)
&
slap_sasl_canonicalize
;
session_callbacks
[
cb
++
].
context
=
conn
;
session_callbacks
[
cb
].
id
=
SASL_CB_LIST_END
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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