]> git.sur5r.net Git - openldap/commitdiff
Whoops. (I'm reconsidering whether or not to accept the ITS#2325.)
authorKurt Zeilenga <kurt@openldap.org>
Fri, 21 Feb 2003 17:48:03 +0000 (17:48 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Fri, 21 Feb 2003 17:48:03 +0000 (17:48 +0000)
libraries/libldap/cyrus.c [new file with mode: 0644]

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
new file mode 100644 (file)
index 0000000..3032f8c
--- /dev/null
@@ -0,0 +1,1164 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/socket.h>
+#include <ac/stdlib.h>
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/errno.h>
+#include <ac/ctype.h>
+
+#include "ldap-int.h"
+
+#ifdef HAVE_CYRUS_SASL
+
+#ifdef LDAP_R_COMPILE
+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.
+*/
+
+int ldap_int_sasl_init( void )
+{
+       /* XXX not threadsafe */
+       static int sasl_initialized = 0;
+
+       static sasl_callback_t client_callbacks[] = {
+#ifdef SASL_CB_GETREALM
+               { SASL_CB_GETREALM, NULL, NULL },
+#endif
+               { SASL_CB_USER, NULL, NULL },
+               { SASL_CB_AUTHNAME, NULL, NULL },
+               { SASL_CB_PASS, NULL, NULL },
+               { SASL_CB_ECHOPROMPT, NULL, NULL },
+               { SASL_CB_NOECHOPROMPT, NULL, NULL },
+               { SASL_CB_LIST_END, NULL, NULL }
+       };
+
+#ifdef HAVE_SASL_VERSION
+#define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\
+       (SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP)
+
+       { int rc;
+       sasl_version( NULL, &rc );
+       if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
+               (rc & 0xffff) < SASL_VERSION_STEP) {
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( TRANSPORT, INFO,
+               "ldap_int_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
+                       rc, SASL_BUILD_VERSION, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+               "ldap_int_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
+                       rc, SASL_BUILD_VERSION, 0 );
+#endif
+               return -1;
+       }
+       }
+#endif
+       if ( sasl_initialized ) {
+               return 0;
+       }
+
+/* SASL 2 takes care of its own memory completely internally */
+#if SASL_VERSION_MAJOR < 2 && !defined(CSRIMALLOC)
+       sasl_set_alloc(
+               ber_memalloc,
+               ber_memcalloc,
+               ber_memrealloc,
+               ber_memfree );
+#endif /* CSRIMALLOC */
+
+#ifdef LDAP_R_COMPILE
+       sasl_set_mutex(
+               ldap_pvt_sasl_mutex_new,
+               ldap_pvt_sasl_mutex_lock,
+               ldap_pvt_sasl_mutex_unlock,    
+               ldap_pvt_sasl_mutex_dispose );    
+
+       ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
+#endif
+
+       if ( sasl_client_init( client_callbacks ) == SASL_OK ) {
+               sasl_initialized = 1;
+               return 0;
+       }
+
+#if SASL_VERSION_MAJOR < 2
+       /* A no-op to make sure we link with Cyrus 1.5 */
+       sasl_client_auth( NULL, NULL, NULL, 0, NULL, NULL );
+#endif
+       return -1;
+}
+
+/*
+ * SASL encryption support for LBER Sockbufs
+ */
+
+struct sb_sasl_data {
+       sasl_conn_t             *sasl_context;
+       unsigned                *sasl_maxbuf;
+       Sockbuf_Buf             sec_buf_in;
+       Sockbuf_Buf             buf_in;
+       Sockbuf_Buf             buf_out;
+};
+
+static int
+sb_sasl_setup( Sockbuf_IO_Desc *sbiod, void *arg )
+{
+       struct sb_sasl_data     *p;
+
+       assert( sbiod != NULL );
+
+       p = LBER_MALLOC( sizeof( *p ) );
+       if ( p == NULL )
+               return -1;
+       p->sasl_context = (sasl_conn_t *)arg;
+       ber_pvt_sb_buf_init( &p->sec_buf_in );
+       ber_pvt_sb_buf_init( &p->buf_in );
+       ber_pvt_sb_buf_init( &p->buf_out );
+       if ( ber_pvt_sb_grow_buffer( &p->sec_buf_in, SASL_MIN_BUFF_SIZE ) < 0 ) {
+               LBER_FREE( p );
+               errno = ENOMEM;
+               return -1;
+       }
+       sasl_getprop( p->sasl_context, SASL_MAXOUTBUF,
+               (SASL_CONST void **) &p->sasl_maxbuf );
+
+       sbiod->sbiod_pvt = p;
+
+       return 0;
+}
+
+static int
+sb_sasl_remove( Sockbuf_IO_Desc *sbiod )
+{
+       struct sb_sasl_data     *p;
+
+       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 );
+       LBER_FREE( p );
+       sbiod->sbiod_pvt = NULL;
+       return 0;
+}
+
+static ber_len_t
+sb_sasl_pkt_length( const unsigned char *buf, unsigned max, int debuglevel )
+{
+       ber_len_t               size;
+
+       assert( buf != NULL );
+
+       size = buf[0] << 24
+               | buf[1] << 16
+               | buf[2] << 8
+               | buf[3];
+   
+       if ( size > SASL_MAX_BUFF_SIZE ) {
+               /* somebody is trying to mess me up. */
+               ber_log_printf( LDAP_DEBUG_ANY, debuglevel,
+                       "sb_sasl_pkt_length: received illegal packet length "
+                       "of %lu bytes\n", (unsigned long)size );      
+               size = 16; /* this should lead to an error. */
+       }
+
+       return size + 4; /* include the size !!! */
+}
+
+/* Drop a processed packet from the input buffer */
+static void
+sb_sasl_drop_packet ( Sockbuf_Buf *sec_buf_in, unsigned max, int debuglevel )
+{
+       ber_slen_t                      len;
+
+       len = sec_buf_in->buf_ptr - sec_buf_in->buf_end;
+       if ( len > 0 )
+               AC_MEMCPY( sec_buf_in->buf_base, sec_buf_in->buf_base +
+                       sec_buf_in->buf_end, len );
+   
+       if ( len >= 4 ) {
+               sec_buf_in->buf_end = sb_sasl_pkt_length( sec_buf_in->buf_base,
+                       max, debuglevel);
+       }
+       else {
+               sec_buf_in->buf_end = 0;
+       }
+       sec_buf_in->buf_ptr = len;
+}
+
+static ber_slen_t
+sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
+{
+       struct sb_sasl_data     *p;
+       ber_slen_t              ret, bufptr;
+   
+       assert( sbiod != NULL );
+       assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
+
+       p = (struct sb_sasl_data *)sbiod->sbiod_pvt;
+
+       /* Are there anything left in the buffer? */
+       ret = ber_pvt_sb_copy_out( &p->buf_in, buf, len );
+       bufptr = ret;
+       len -= ret;
+
+       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 ) {
+               ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base,
+                       4 - p->sec_buf_in.buf_ptr );
+#ifdef EINTR
+               if ( ( ret < 0 ) && ( errno == EINTR ) )
+                       continue;
+#endif
+               if ( ret <= 0 )
+                       return bufptr ? bufptr : ret;
+
+               p->sec_buf_in.buf_ptr += ret;
+       }
+
+       /* The new packet always starts at p->sec_buf_in.buf_base */
+       ret = sb_sasl_pkt_length( p->sec_buf_in.buf_base,
+               *p->sasl_maxbuf, sbiod->sbiod_sb->sb_debug );
+
+       /* Grow the packet buffer if neccessary */
+       if ( ( p->sec_buf_in.buf_size < (ber_len_t) ret ) && 
+               ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 )
+       {
+               errno = ENOMEM;
+               return -1;
+       }
+       p->sec_buf_in.buf_end = ret;
+
+       /* Did we read the whole encrypted packet? */
+       while ( p->sec_buf_in.buf_ptr < p->sec_buf_in.buf_end ) {
+               /* No, we have got only a part of it */
+               ret = p->sec_buf_in.buf_end - p->sec_buf_in.buf_ptr;
+
+               ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base +
+                       p->sec_buf_in.buf_ptr, ret );
+#ifdef EINTR
+               if ( ( ret < 0 ) && ( errno == EINTR ) )
+                       continue;
+#endif
+               if ( ret <= 0 )
+                       return bufptr ? bufptr : ret;
+
+               p->sec_buf_in.buf_ptr += ret;
+       }
+
+       /* Decode the packet */
+       ret = sasl_decode( p->sasl_context, p->sec_buf_in.buf_base,
+               p->sec_buf_in.buf_end,
+               (SASL_CONST char **)&p->buf_in.buf_base,
+               (unsigned *)&p->buf_in.buf_end );
+
+       /* Drop the packet from the input buffer */
+       sb_sasl_drop_packet( &p->sec_buf_in,
+                       *p->sasl_maxbuf, sbiod->sbiod_sb->sb_debug );
+
+       if ( ret != SASL_OK ) {
+               ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug,
+                       "sb_sasl_read: failed to decode packet: %s\n",
+                       sasl_errstring( ret, NULL, NULL ) );
+               errno = EIO;
+               return -1;
+       }
+       
+       p->buf_in.buf_size = p->buf_in.buf_end;
+
+       bufptr += ber_pvt_sb_copy_out( &p->buf_in, (char*) buf + bufptr, len );
+
+       return bufptr;
+}
+
+static ber_slen_t
+sb_sasl_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
+{
+       struct sb_sasl_data     *p;
+       int                     ret;
+
+       assert( sbiod != NULL );
+       assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
+
+       p = (struct sb_sasl_data *)sbiod->sbiod_pvt;
+
+       /* Are there anything left in the buffer? */
+       if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
+               ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
+               if ( ret < 0 )
+                       return ret;
+               /* Still have something left?? */
+               if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
+                       errno = EAGAIN;
+                       return 0;
+               }
+       }
+
+       /* now encode the next packet. */
+#if SASL_VERSION_MAJOR >= 2
+       ber_pvt_sb_buf_init( &p->buf_out );
+       /* sasl v2 makes sure this number is correct */
+       if ( len > *p->sasl_maxbuf )
+               len = *p->sasl_maxbuf;
+#else
+       ber_pvt_sb_buf_destroy( &p->buf_out );
+       if ( len > *p->sasl_maxbuf - 100 )
+               len = *p->sasl_maxbuf - 100;    /* For safety margin */
+#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,
+                       "sb_sasl_write: failed to encode packet: %s\n",
+                       sasl_errstring( ret, NULL, NULL ) );
+               return -1;
+       }
+       p->buf_out.buf_end = p->buf_out.buf_size;
+
+       ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
+       if ( ret <= 0 )
+               return ret;
+       return len;
+}
+
+static int
+sb_sasl_ctrl( Sockbuf_IO_Desc *sbiod, int opt, void *arg )
+{
+       struct sb_sasl_data     *p;
+
+       p = (struct sb_sasl_data *)sbiod->sbiod_pvt;
+
+       if ( opt == LBER_SB_OPT_DATA_READY ) {
+               if ( p->buf_in.buf_ptr != p->buf_in.buf_end )
+                       return 1;
+       }
+       
+       return LBER_SBIOD_CTRL_NEXT( sbiod, opt, arg );
+}
+
+Sockbuf_IO ldap_pvt_sockbuf_io_sasl = {
+       sb_sasl_setup,          /* sbi_setup */
+       sb_sasl_remove,         /* sbi_remove */
+       sb_sasl_ctrl,           /* sbi_ctrl */
+       sb_sasl_read,           /* sbi_read */
+       sb_sasl_write,          /* sbi_write */
+       NULL                    /* sbi_close */
+};
+
+int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
+{
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_install\n", 0, 0, 0 );
+#else
+       Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_install\n",
+               0, 0, 0 );
+#endif
+
+       /* don't install the stuff unless security has been negotiated */
+
+       if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO,
+                       &ldap_pvt_sockbuf_io_sasl ) )
+       {
+#ifdef LDAP_DEBUG
+               ber_sockbuf_add_io( sb, &ber_sockbuf_io_debug,
+                       LBER_SBIOD_LEVEL_APPLICATION, (void *)"sasl_" );
+#endif
+               ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl,
+                       LBER_SBIOD_LEVEL_APPLICATION, ctx_arg );
+       }
+
+       return LDAP_SUCCESS;
+}
+
+static int
+sasl_err2ldap( int saslerr )
+{
+       int rc;
+
+       switch (saslerr) {
+               case SASL_CONTINUE:
+                       rc = LDAP_MORE_RESULTS_TO_RETURN;
+                       break;
+               case SASL_INTERACT:
+                       rc = LDAP_LOCAL_ERROR;
+                       break;
+               case SASL_OK:
+                       rc = LDAP_SUCCESS;
+                       break;
+               case SASL_FAIL:
+                       rc = LDAP_LOCAL_ERROR;
+                       break;
+               case SASL_NOMEM:
+                       rc = LDAP_NO_MEMORY;
+                       break;
+               case SASL_NOMECH:
+                       rc = LDAP_AUTH_UNKNOWN;
+                       break;
+               case SASL_BADAUTH:
+                       rc = LDAP_AUTH_UNKNOWN;
+                       break;
+               case SASL_NOAUTHZ:
+                       rc = LDAP_PARAM_ERROR;
+                       break;
+               case SASL_TOOWEAK:
+               case SASL_ENCRYPT:
+                       rc = LDAP_AUTH_UNKNOWN;
+                       break;
+               default:
+                       rc = LDAP_LOCAL_ERROR;
+                       break;
+       }
+
+       assert( rc == LDAP_SUCCESS || LDAP_API_ERROR( rc ) );
+       return rc;
+}
+
+int
+ldap_int_sasl_open(
+       LDAP *ld, 
+       LDAPConn *lc,
+       const char * host )
+{
+       int rc;
+       sasl_conn_t *ctx;
+
+       assert( lc->lconn_sasl_ctx == NULL );
+
+       if ( host == NULL ) {
+               ld->ld_errno = LDAP_LOCAL_ERROR;
+               return ld->ld_errno;
+       }
+
+#if SASL_VERSION_MAJOR >= 2
+       rc = sasl_client_new( "ldap", host, NULL, NULL,
+               NULL, 0, &ctx );
+#else
+       rc = sasl_client_new( "ldap", host, NULL,
+               SASL_SECURITY_LAYER, &ctx );
+#endif
+
+       if ( rc != SASL_OK ) {
+               ld->ld_errno = sasl_err2ldap( rc );
+               return ld->ld_errno;
+       }
+
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TRANSPORT, DETAIL1, "ldap_int_sasl_open: host=%s\n", 
+               host, 0, 0 );
+#else
+       Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: host=%s\n",
+               host, 0, 0 );
+#endif
+
+       lc->lconn_sasl_ctx = ctx;
+
+       return LDAP_SUCCESS;
+}
+
+int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
+{
+       sasl_conn_t *ctx = lc->lconn_sasl_ctx;
+
+       if( ctx != NULL ) {
+               sasl_dispose( &ctx );
+               lc->lconn_sasl_ctx = NULL;
+       }
+
+       return LDAP_SUCCESS;
+}
+
+int
+ldap_int_sasl_bind(
+       LDAP                    *ld,
+       const char              *dn,
+       const char              *mechs,
+       LDAPControl             **sctrls,
+       LDAPControl             **cctrls,
+       unsigned                flags,
+       LDAP_SASL_INTERACT_PROC *interact,
+       void * defaults )
+{
+       char *data;
+       const char *mech = NULL;
+       const char *pmech = NULL;
+       int                     saslrc, rc;
+       sasl_ssf_t              *ssf = NULL;
+       sasl_conn_t     *ctx;
+       sasl_interact_t *prompts = NULL;
+       unsigned credlen;
+       struct berval ccred;
+       ber_socket_t            sd;
+
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TRANSPORT, ARGS, "ldap_int_sasl_bind: %s\n", 
+               mechs ? mechs : "<null>", 0, 0 );
+#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) {
+               ld->ld_errno = LDAP_NOT_SUPPORTED;
+               return ld->ld_errno;
+       }
+
+       ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd );
+
+       if ( sd == AC_SOCKET_INVALID ) {
+               /* not connected yet */
+               int rc;
+
+               rc = ldap_open_defconn( ld );
+               if( rc < 0 ) return ld->ld_errno;
+
+               ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd );
+
+               if( sd == AC_SOCKET_INVALID ) {
+                       ld->ld_errno = LDAP_LOCAL_ERROR;
+                       return ld->ld_errno;
+               }
+       }   
+
+       ctx = ld->ld_defconn->lconn_sasl_ctx;
+
+       if( ctx == NULL ) {
+               ld->ld_errno = LDAP_LOCAL_ERROR;
+               return ld->ld_errno;
+       }
+
+       /* (re)set security properties */
+       sasl_setprop( ctx, SASL_SEC_PROPS,
+               &ld->ld_options.ldo_sasl_secprops );
+
+       ccred.bv_val = NULL;
+       ccred.bv_len = 0;
+
+       do {
+               saslrc = sasl_client_start( ctx,
+                       mechs,
+#if SASL_VERSION_MAJOR < 2
+                       NULL,
+#endif
+                       &prompts,
+                       (SASL_CONST char **)&ccred.bv_val,
+                       &credlen,
+                       &mech );
+
+               if( pmech == NULL && mech != NULL ) {
+                       pmech = mech;
+
+                       if( flags != LDAP_SASL_QUIET ) {
+                               fprintf(stderr,
+                                       "SASL/%s authentication started\n",
+                                       pmech );
+                       }
+               }
+
+               if( saslrc == SASL_INTERACT ) {
+                       int res;
+
+#if SASL_VERSION_MAJOR >= 2
+                       /* XXX the application should free interact results.
+                        * FIXME: this should happen only 
+                        * if saslrc == SASL_INTERACT
+                        *
+                        * I assume that prompts->result is not needed
+                        * by the subsequent call to (interact)() */
+                       if ( prompts != NULL && prompts->result != NULL ) {
+                               LDAP_FREE( (void *)prompts->result );
+                               prompts->result = NULL;
+                       }
+#endif
+
+                       if( !interact ) break;
+                       res = (interact)( ld, flags, defaults, prompts );
+                       if( res != LDAP_SUCCESS ) {
+                               break;
+                       }
+               }
+       } while ( saslrc == SASL_INTERACT );
+
+       ccred.bv_len = credlen;
+
+       if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) {
+               ld->ld_errno = sasl_err2ldap( saslrc );
+#if SASL_VERSION_MAJOR >= 2
+               ld->ld_error = (char *)sasl_errdetail( ctx );
+#endif
+               return ld->ld_errno;
+       }
+
+       do {
+               struct berval *scred;
+               unsigned credlen;
+
+               scred = NULL;
+
+               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 ( TRANSPORT, 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;
+               }
+
+               if( rc == LDAP_SUCCESS && saslrc == SASL_OK ) {
+                       /* we're done, no need to step */
+                       if( scred && scred->bv_len ) {
+                               /* but server provided us with data! */
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( TRANSPORT, 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;
+                       }
+                       break;
+               }
+
+               do {
+                       saslrc = sasl_client_step( ctx,
+                               (scred == NULL) ? NULL : scred->bv_val,
+                               (scred == NULL) ? 0 : scred->bv_len,
+                               &prompts,
+                               (SASL_CONST char **)&ccred.bv_val,
+                               &credlen );
+
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( TRANSPORT, DETAIL1, 
+                                       "ldap_int_sasl_bind: sasl_client_step: %d\n", saslrc,0,0 );
+#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( !interact ) break;
+                               res = (interact)( ld, flags, defaults, prompts );
+                               if( res != LDAP_SUCCESS ) {
+                                       break;
+                               }
+                       }
+               } while ( saslrc == SASL_INTERACT );
+
+               ccred.bv_len = credlen;
+               ber_bvfree( scred );
+
+               if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) {
+                       ld->ld_errno = sasl_err2ldap( saslrc );
+#if SASL_VERSION_MAJOR >= 2
+                       ld->ld_error = (char *)sasl_errdetail( ctx );
+#endif
+                       return ld->ld_errno;
+               }
+       } while ( rc == LDAP_SASL_BIND_IN_PROGRESS );
+
+       if ( rc != LDAP_SUCCESS ) {
+               return rc;
+       }
+
+       if ( saslrc != SASL_OK ) {
+#if SASL_VERSION_MAJOR >= 2
+               ld->ld_error = (char *)sasl_errdetail( ctx );
+#endif
+               return ld->ld_errno = sasl_err2ldap( saslrc );
+       }
+
+       if( flags != LDAP_SASL_QUIET ) {
+               saslrc = sasl_getprop( ctx, SASL_USERNAME, (SASL_CONST void **) &data );
+               if( saslrc == SASL_OK && data && *data ) {
+                       fprintf( stderr, "SASL username: %s\n", 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, (SASL_CONST void **) &ssf );
+       if( saslrc == SASL_OK ) {
+               if( flags != LDAP_SASL_QUIET ) {
+                       fprintf( stderr, "SASL SSF: %lu\n",
+                               (unsigned long) *ssf );
+               }
+
+               if( ssf && *ssf ) {
+                       if( flags != LDAP_SASL_QUIET ) {
+                               fprintf( stderr, "SASL installing layers\n" );
+                       }
+                       ldap_pvt_sasl_install( ld->ld_conns->lconn_sb, ctx );
+               }
+       }
+
+       return rc;
+}
+
+int
+ldap_int_sasl_external(
+       LDAP *ld,
+       LDAPConn *conn,
+       const char * authid,
+       ber_len_t ssf )
+{
+       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 );
+       if ( sc == SASL_OK )
+               sc = sasl_setprop( ctx, SASL_AUTH_EXTERNAL, authid );
+#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;
+       }
+
+       return LDAP_SUCCESS;
+}
+
+
+int ldap_pvt_sasl_secprops(
+       const char *in,
+       sasl_security_properties_t *secprops )
+{
+       int i;
+       char **props = ldap_str2charray( in, "," );
+       unsigned sflags = 0;
+       int got_sflags = 0;
+       sasl_ssf_t max_ssf = 0;
+       int got_max_ssf = 0;
+       sasl_ssf_t min_ssf = 0;
+       int got_min_ssf = 0;
+       unsigned maxbufsize = 0;
+       int got_maxbufsize = 0;
+
+       if( props == NULL || secprops == NULL ) {
+               return LDAP_PARAM_ERROR;
+       }
+
+       for( i=0; props[i]; i++ ) {
+               if( !strcasecmp(props[i], "none") ) {
+                       got_sflags++;
+
+               } else if( !strcasecmp(props[i], "noplain") ) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_NOPLAINTEXT;
+
+               } else if( !strcasecmp(props[i], "noactive") ) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_NOACTIVE;
+
+               } else if( !strcasecmp(props[i], "nodict") ) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_NODICTIONARY;
+
+               } else if( !strcasecmp(props[i], "forwardsec") ) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_FORWARD_SECRECY;
+
+               } else if( !strcasecmp(props[i], "noanonymous")) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_NOANONYMOUS;
+
+               } else if( !strcasecmp(props[i], "passcred") ) {
+                       got_sflags++;
+                       sflags |= SASL_SEC_PASS_CREDENTIALS;
+
+               } else if( !strncasecmp(props[i],
+                       "minssf=", sizeof("minssf")) )
+               {
+                       if( isdigit( (unsigned char) props[i][sizeof("minssf")] ) ) {
+                               got_min_ssf++;
+                               min_ssf = atoi( &props[i][sizeof("minssf")] );
+                       } else {
+                               return LDAP_NOT_SUPPORTED;
+                       }
+
+               } else if( !strncasecmp(props[i],
+                       "maxssf=", sizeof("maxssf")) )
+               {
+                       if( isdigit( (unsigned char) props[i][sizeof("maxssf")] ) ) {
+                               got_max_ssf++;
+                               max_ssf = atoi( &props[i][sizeof("maxssf")] );
+                       } else {
+                               return LDAP_NOT_SUPPORTED;
+                       }
+
+               } else if( !strncasecmp(props[i],
+                       "maxbufsize=", sizeof("maxbufsize")) )
+               {
+                       if( isdigit( (unsigned char) props[i][sizeof("maxbufsize")] ) ) {
+                               got_maxbufsize++;
+                               maxbufsize = atoi( &props[i][sizeof("maxbufsize")] );
+                       } else {
+                               return LDAP_NOT_SUPPORTED;
+                       }
+
+                       if( maxbufsize && (( maxbufsize < SASL_MIN_BUFF_SIZE )
+                               || (maxbufsize > SASL_MAX_BUFF_SIZE )))
+                       {
+                               /* bad maxbufsize */
+                               return LDAP_PARAM_ERROR;
+                       }
+
+               } else {
+                       return LDAP_NOT_SUPPORTED;
+               }
+       }
+
+       if(got_sflags) {
+               secprops->security_flags = sflags;
+       }
+       if(got_min_ssf) {
+               secprops->min_ssf = min_ssf;
+       }
+       if(got_max_ssf) {
+               secprops->max_ssf = max_ssf;
+       }
+       if(got_maxbufsize) {
+               secprops->maxbufsize = maxbufsize;
+       }
+
+       ldap_charray_free( props );
+       return LDAP_SUCCESS;
+}
+
+int
+ldap_int_sasl_config( struct ldapoptions *lo, int option, const char *arg )
+{
+       int rc;
+
+       switch( option ) {
+       case LDAP_OPT_X_SASL_SECPROPS:
+               rc = ldap_pvt_sasl_secprops( arg, &lo->ldo_sasl_secprops );
+               if( rc == LDAP_SUCCESS ) return 0;
+       }
+
+       return -1;
+}
+
+int
+ldap_int_sasl_get_option( LDAP *ld, int option, void *arg )
+{
+       if ( ld == NULL )
+               return -1;
+
+       switch ( option ) {
+               case LDAP_OPT_X_SASL_MECH: {
+                       *(char **)arg = ld->ld_options.ldo_def_sasl_mech
+                               ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_mech ) : NULL;
+               } break;
+               case LDAP_OPT_X_SASL_REALM: {
+                       *(char **)arg = ld->ld_options.ldo_def_sasl_realm
+                               ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_realm ) : NULL;
+               } break;
+               case LDAP_OPT_X_SASL_AUTHCID: {
+                       *(char **)arg = ld->ld_options.ldo_def_sasl_authcid
+                               ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_authcid ) : NULL;
+               } break;
+               case LDAP_OPT_X_SASL_AUTHZID: {
+                       *(char **)arg = ld->ld_options.ldo_def_sasl_authzid
+                               ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_authzid ) : NULL;
+               } break;
+
+               case LDAP_OPT_X_SASL_SSF: {
+                       int sc;
+                       sasl_ssf_t      *ssf;
+                       sasl_conn_t *ctx;
+
+                       if( ld->ld_defconn == NULL ) {
+                               return -1;
+                       }
+
+                       ctx = ld->ld_defconn->lconn_sasl_ctx;
+
+                       if ( ctx == NULL ) {
+                               return -1;
+                       }
+
+                       sc = sasl_getprop( ctx, SASL_SSF,
+                               (SASL_CONST void **) &ssf );
+
+                       if ( sc != SASL_OK ) {
+                               return -1;
+                       }
+
+                       *(ber_len_t *)arg = *ssf;
+               } break;
+
+               case LDAP_OPT_X_SASL_SSF_EXTERNAL:
+                       /* this option is write only */
+                       return -1;
+
+               case LDAP_OPT_X_SASL_SSF_MIN:
+                       *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf;
+                       break;
+               case LDAP_OPT_X_SASL_SSF_MAX:
+                       *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf;
+                       break;
+               case LDAP_OPT_X_SASL_MAXBUFSIZE:
+                       *(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
+                       break;
+
+               case LDAP_OPT_X_SASL_SECPROPS:
+                       /* this option is write only */
+                       return -1;
+
+               default:
+                       return -1;
+       }
+       return 0;
+}
+
+int
+ldap_int_sasl_set_option( LDAP *ld, int option, void *arg )
+{
+       if ( ld == NULL )
+               return -1;
+
+       switch ( option ) {
+       case LDAP_OPT_X_SASL_SSF:
+               /* This option is read-only */
+               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;
+               }
+
+               ctx = ld->ld_defconn->lconn_sasl_ctx;
+
+               if ( ctx == 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;
+               }
+               } break;
+
+       case LDAP_OPT_X_SASL_SSF_MIN:
+               ld->ld_options.ldo_sasl_secprops.min_ssf = *(ber_len_t *)arg;
+               break;
+       case LDAP_OPT_X_SASL_SSF_MAX:
+               ld->ld_options.ldo_sasl_secprops.max_ssf = *(ber_len_t *)arg;
+               break;
+       case LDAP_OPT_X_SASL_MAXBUFSIZE:
+               ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
+               break;
+
+       case LDAP_OPT_X_SASL_SECPROPS: {
+               int sc;
+               sc = ldap_pvt_sasl_secprops( (char *) arg,
+                       &ld->ld_options.ldo_sasl_secprops );
+
+               return sc == LDAP_SUCCESS ? 0 : -1;
+               }
+
+       default:
+               return -1;
+       }
+       return 0;
+}
+
+#ifdef LDAP_R_COMPILE
+#define LDAP_DEBUG_R_SASL
+void *ldap_pvt_sasl_mutex_new(void)
+{
+       ldap_pvt_thread_mutex_t *mutex;
+
+       mutex = (ldap_pvt_thread_mutex_t *) LDAP_MALLOC(
+               sizeof(ldap_pvt_thread_mutex_t) );
+
+       if ( ldap_pvt_thread_mutex_init( mutex ) == 0 ) {
+               return mutex;
+       }
+#ifndef LDAP_DEBUG_R_SASL
+       assert( 0 );
+#endif /* !LDAP_DEBUG_R_SASL */
+       return NULL;
+}
+
+int ldap_pvt_sasl_mutex_lock(void *mutex)
+{
+#ifdef LDAP_DEBUG_R_SASL
+       if ( mutex == NULL ) {
+               return SASL_OK;
+       }
+#else /* !LDAP_DEBUG_R_SASL */
+       assert( mutex );
+#endif /* !LDAP_DEBUG_R_SASL */
+       return ldap_pvt_thread_mutex_lock( (ldap_pvt_thread_mutex_t *)mutex )
+               ? SASL_FAIL : SASL_OK;
+}
+
+int ldap_pvt_sasl_mutex_unlock(void *mutex)
+{
+#ifdef LDAP_DEBUG_R_SASL
+       if ( mutex == NULL ) {
+               return SASL_OK;
+       }
+#else /* !LDAP_DEBUG_R_SASL */
+       assert( mutex );
+#endif /* !LDAP_DEBUG_R_SASL */
+       return ldap_pvt_thread_mutex_unlock( (ldap_pvt_thread_mutex_t *)mutex )
+               ? SASL_FAIL : SASL_OK;
+}
+
+void ldap_pvt_sasl_mutex_dispose(void *mutex)
+{
+#ifdef LDAP_DEBUG_R_SASL
+       if ( mutex == NULL ) {
+               return;
+       }
+#else /* !LDAP_DEBUG_R_SASL */
+       assert( mutex );
+#endif /* !LDAP_DEBUG_R_SASL */
+       (void) ldap_pvt_thread_mutex_destroy( (ldap_pvt_thread_mutex_t *)mutex );
+       LDAP_FREE( mutex );
+}
+#endif
+
+#else
+int ldap_int_sasl_init( void )
+{ return LDAP_SUCCESS; }
+
+int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
+{ return LDAP_SUCCESS; }
+
+int
+ldap_int_sasl_bind(
+       LDAP                    *ld,
+       const char              *dn,
+       const char              *mechs,
+       LDAPControl             **sctrls,
+       LDAPControl             **cctrls,
+       unsigned                flags,
+       LDAP_SASL_INTERACT_PROC *interact,
+       void * defaults )
+{ return LDAP_NOT_SUPPORTED; }
+
+int
+ldap_int_sasl_external(
+       LDAP *ld,
+       LDAPConn *conn,
+       const char * authid,
+       ber_len_t ssf )
+{ return LDAP_SUCCESS; }
+
+#endif /* HAVE_CYRUS_SASL */