/* $OpenLDAP$ */
/*
- * Copyright 1999-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1999-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
ldap_pvt_thread_mutex_t ldap_int_sasl_mutex;
#endif
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
#include <sasl.h>
+#endif
+
+#if SASL_VERSION_MAJOR >= 2
+#define SASL_CONST const
+#else
+#define SASL_CONST
+#endif
/*
* Various Cyrus SASL related stuff.
assert( sbiod != NULL );
p = (struct sb_sasl_data *)sbiod->sbiod_pvt;
+#if SASL_VERSION_MAJOR >= 2
+ /*
+ * SASLv2 encode/decode buffers are managed by
+ * libsasl2. Ensure they are not freed by liblber.
+ */
+ p->buf_in.buf_base = NULL;
+ p->buf_out.buf_base = NULL;
+#endif
ber_pvt_sb_buf_destroy( &p->sec_buf_in );
ber_pvt_sb_buf_destroy( &p->buf_in );
ber_pvt_sb_buf_destroy( &p->buf_out );
len = sec_buf_in->buf_ptr - sec_buf_in->buf_end;
if ( len > 0 )
- memmove( sec_buf_in->buf_base, sec_buf_in->buf_base +
+ AC_MEMCPY( sec_buf_in->buf_base, sec_buf_in->buf_base +
sec_buf_in->buf_end, len );
if ( len >= 4 ) {
if ( len == 0 )
return bufptr;
+#if SASL_VERSION_MAJOR >= 2
+ ber_pvt_sb_buf_init( &p->buf_in );
+#else
ber_pvt_sb_buf_destroy( &p->buf_in );
+#endif
/* Read the length of the packet */
while ( p->sec_buf_in.buf_ptr < 4 ) {
sbiod->sbiod_sb->sb_debug );
/* Grow the packet buffer if neccessary */
- if ( ( p->sec_buf_in.buf_size < ret ) &&
+ if ( ( p->sec_buf_in.buf_size < (ber_len_t) ret ) &&
ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 )
{
errno = ENOMEM;
/* Decode the packet */
ret = sasl_decode( p->sasl_context, p->sec_buf_in.buf_base,
- p->sec_buf_in.buf_end, &p->buf_in.buf_base,
+ p->sec_buf_in.buf_end,
+ (SASL_CONST char **)&p->buf_in.buf_base,
(unsigned *)&p->buf_in.buf_end );
if ( ret != SASL_OK ) {
ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug,
}
/* now encode the next packet. */
+#if SASL_VERSION_MAJOR >= 2
+ ber_pvt_sb_buf_init( &p->buf_out );
+#else
ber_pvt_sb_buf_destroy( &p->buf_out );
- ret = sasl_encode( p->sasl_context, buf, len, &p->buf_out.buf_base,
+#endif
+ ret = sasl_encode( p->sasl_context, buf, len,
+ (SASL_CONST char **)&p->buf_out.buf_base,
(unsigned *)&p->buf_out.buf_size );
if ( ret != SASL_OK ) {
ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug,
int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_install\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_install\n",
0, 0, 0 );
+#endif
/* don't install the stuff unless security has been negotiated */
sasl_conn_t *ctx;
sasl_callback_t *session_callbacks =
- ber_memcalloc( 2, sizeof( sasl_callback_t ) );
+ LDAP_CALLOC( 2, sizeof( sasl_callback_t ) );
if( session_callbacks == NULL ) return LDAP_NO_MEMORY;
return ld->ld_errno;
}
+#if SASL_VERSION_MAJOR >= 2
+ rc = sasl_client_new( "ldap", host, NULL, NULL,
+ session_callbacks, 0, &ctx );
+#else
rc = sasl_client_new( "ldap", host, session_callbacks,
SASL_SECURITY_LAYER, &ctx );
- ber_memfree( session_callbacks );
+#endif
+ LDAP_FREE( session_callbacks );
if ( rc != SASL_OK ) {
ld->ld_errno = sasl_err2ldap( rc );
return ld->ld_errno;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
+ "ldap_int_sasl_open: host=%s\n", host ));
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: host=%s\n",
host, 0, 0 );
+#endif
lc->lconn_sasl_ctx = ctx;
if( ssf ) {
+#if SASL_VERSION_MAJOR >= 2
+ (void) sasl_setprop( ctx, SASL_SSF_EXTERNAL,
+ (void *) &ssf );
+#else
sasl_external_properties_t extprops;
memset(&extprops, 0L, sizeof(extprops));
extprops.ssf = ssf;
(void) sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
-
+#endif
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
+ "ldap_int_sasl_open: ssf=%ld\n", (long) ssf ));
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: ssf=%ld\n",
(long) ssf, 0, 0 );
+#endif
}
return LDAP_SUCCESS;
struct berval ccred;
ber_socket_t sd;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_ARGS,
+ "ldap_int_sasl_bind: %s\n", mechs ? mechs : "<null>" ));
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
mechs ? mechs : "<null>", 0, 0 );
+#endif
/* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */
if (ld->ld_version < LDAP_VERSION3) {
do {
saslrc = sasl_client_start( ctx,
mechs,
+#if SASL_VERSION_MAJOR < 2
NULL,
+#endif
&prompts,
- &ccred.bv_val,
+ (SASL_CONST char **)&ccred.bv_val,
&credlen,
&mech );
}
}
+#if SASL_VERSION_MAJOR >= 2
+ /* XXX the application should free interact results. */
+ if ( prompts != NULL && prompts->result != NULL ) {
+ LDAP_FREE( (void *)prompts->result );
+ prompts->result = NULL;
+ }
+#endif
+
if( saslrc == SASL_INTERACT ) {
int res;
if( !interact ) break;
rc = ldap_sasl_bind_s( ld, dn, mech, &ccred, sctrls, cctrls, &scred );
if ( ccred.bv_val != NULL ) {
+#if SASL_VERSION_MAJOR < 2
LDAP_FREE( ccred.bv_val );
+#endif
ccred.bv_val = NULL;
}
if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
if( scred && scred->bv_len ) {
/* and server provided us with data? */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
+ "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
+ rc, saslrc, scred->bv_len ));
+#else
Debug( LDAP_DEBUG_TRACE,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
rc, saslrc, scred->bv_len );
+#endif
ber_bvfree( scred );
}
return ld->ld_errno;
/* we're done, no need to step */
if( scred && scred->bv_len ) {
/* but server provided us with data! */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
+ "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
+ rc, saslrc, scred->bv_len ));
+#else
Debug( LDAP_DEBUG_TRACE,
"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
rc, saslrc, scred->bv_len );
+#endif
ber_bvfree( scred );
return ld->ld_errno = LDAP_LOCAL_ERROR;
}
(scred == NULL) ? NULL : scred->bv_val,
(scred == NULL) ? 0 : scred->bv_len,
&prompts,
- &ccred.bv_val,
+ (SASL_CONST char **)&ccred.bv_val,
&credlen );
- Debug( LDAP_DEBUG_TRACE, "sasl_client_start: %d\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "cyrus", LDAP_LEVEL_DETAIL1,
+ "ldap_int_sasl_bind: sasl_client_step: %d\n", saslrc ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "sasl_client_step: %d\n",
saslrc, 0, 0 );
+#endif
+
+#if SASL_VERSION_MAJOR >= 2
+ /* XXX the application should free interact results. */
+ if ( prompts != NULL && prompts->result != NULL ) {
+ LDAP_FREE( (void *)prompts->result );
+ prompts->result = NULL;
+ }
+#endif
if( saslrc == SASL_INTERACT ) {
int res;
}
if( flags != LDAP_SASL_QUIET ) {
- saslrc = sasl_getprop( ctx, SASL_USERNAME, (void **) &data );
+ saslrc = sasl_getprop( ctx, SASL_USERNAME, (SASL_CONST void **) &data );
if( saslrc == SASL_OK && data && *data ) {
fprintf( stderr, "SASL username: %s\n", data );
}
- saslrc = sasl_getprop( ctx, SASL_REALM, (void **) &data );
+#if SASL_VERSION_MAJOR >= 2
+ saslrc = sasl_getprop( ctx, SASL_DEFUSERREALM, (SASL_CONST void **) &data );
+#else
+ saslrc = sasl_getprop( ctx, SASL_REALM, (SASL_CONST void **) &data );
+#endif
if( saslrc == SASL_OK && data && *data ) {
fprintf( stderr, "SASL realm: %s\n", data );
}
}
- saslrc = sasl_getprop( ctx, SASL_SSF, (void **) &ssf );
+ saslrc = sasl_getprop( ctx, SASL_SSF, (SASL_CONST void **) &ssf );
if( saslrc == SASL_OK ) {
if( flags != LDAP_SASL_QUIET ) {
fprintf( stderr, "SASL SSF: %lu\n",
{
int sc;
sasl_conn_t *ctx;
+#if SASL_VERSION_MAJOR < 2
sasl_external_properties_t extprops;
+#endif
ctx = conn->lconn_sasl_ctx;
if ( ctx == NULL ) {
return LDAP_LOCAL_ERROR;
}
-
+
+#if SASL_VERSION_MAJOR >= 2
+ sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &ssf );
+#else
memset( &extprops, '\0', sizeof(extprops) );
extprops.ssf = ssf;
extprops.auth_id = (char *) authid;
-
+
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
-
+#endif
+
if ( sc != SASL_OK ) {
return LDAP_LOCAL_ERROR;
}
}
sc = sasl_getprop( ctx, SASL_SSF,
- (void **) &ssf );
+ (SASL_CONST void **) &ssf );
if ( sc != SASL_OK ) {
return -1;
case LDAP_OPT_X_SASL_SSF_EXTERNAL: {
int sc;
+#if SASL_VERSION_MAJOR < 2
sasl_external_properties_t extprops;
+#endif
sasl_conn_t *ctx;
if( ld->ld_defconn == NULL ) {
return -1;
}
+#if SASL_VERSION_MAJOR >= 2
+ sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, arg);
+#else
memset(&extprops, 0L, sizeof(extprops));
extprops.ssf = * (ber_len_t *) arg;
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
+#endif
if ( sc != SASL_OK ) {
return -1;
projects / openldap / blobdiff