upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#3864 use sasl_ssf_t where expected

Browse source
This commit is contained in:
Howard Chu 2007-10-06 14:55:53 +00:00
parent c103b3c9e9
commit 65db0bf8eb
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/libldap/cyrus.c
View file

@ -899,6 +899,8 @@ ldap_int_sasl_external(
sasl_conn_t *ctx; sasl_conn_t *ctx;
#if SASL_VERSION_MAJOR < 2 #if SASL_VERSION_MAJOR < 2
sasl_external_properties_t extprops; sasl_external_properties_t extprops;
#else
sasl_ssf_t sasl_ssf = ssf;
#endif #endif
ctx = conn->lconn_sasl_authctx; ctx = conn->lconn_sasl_authctx;
@ -908,7 +910,7 @@ ldap_int_sasl_external(
} }
#if SASL_VERSION_MAJOR >= 2 #if SASL_VERSION_MAJOR >= 2
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &ssf ); sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &sasl_ssf );
if ( sc == SASL_OK ) if ( sc == SASL_OK )
sc = sasl_setprop( ctx, SASL_AUTH_EXTERNAL, authid ); sc = sasl_setprop( ctx, SASL_AUTH_EXTERNAL, authid );
#else #else
@ -1206,6 +1208,8 @@ ldap_int_sasl_set_option( LDAP *ld, int option, void *arg )
int sc; int sc;
#if SASL_VERSION_MAJOR < 2 #if SASL_VERSION_MAJOR < 2
sasl_external_properties_t extprops; sasl_external_properties_t extprops;
#else
sasl_ssf_t sasl_ssf;
#endif #endif
sasl_conn_t *ctx; sasl_conn_t *ctx;
@ -1220,7 +1224,8 @@ ldap_int_sasl_set_option( LDAP *ld, int option, void *arg )
} }
#if SASL_VERSION_MAJOR >= 2 #if SASL_VERSION_MAJOR >= 2
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, arg); sasl_ssf = * (ber_len_t *)arg;
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &sasl_ssf);
#else #else
memset(&extprops, 0L, sizeof(extprops)); memset(&extprops, 0L, sizeof(extprops));