ITS#897 Internal connection that is closed on one end and about to

[openldap] / libraries / libldap / cyrus.c

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 0320f7bbc8ed308afd6e1448f39a76e41837e525..3b35dd2fbedeead8de5fa82c2690054afde121d7 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -13,6 +13,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/errno.h>
+#include <ac/ctype.h>
 
 #include "ldap-int.h"
 #ifdef LDAP_R_COMPILE
@@ -209,7 +210,8 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
 
        /* Grow the packet buffer if neccessary */
        if ( ( p->sec_buf_in.buf_size < ret ) && 
-                       ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 ) {
+               ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 )
+       {
                errno = ENOMEM;
                return -1;
        }
@@ -325,8 +327,14 @@ int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
 
        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;
 }
@@ -400,7 +408,7 @@ ldap_int_sasl_open(
        assert( lc->lconn_sasl_ctx == NULL );
 
        if ( host == NULL ) {
-               ld->ld_errno = LDAP_UNAVAILABLE;
+               ld->ld_errno = LDAP_LOCAL_ERROR;
                return ld->ld_errno;
        }
 
@@ -435,9 +443,8 @@ ldap_int_sasl_open(
 int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
 {
        sasl_conn_t *ctx = lc->lconn_sasl_ctx;
-       assert( ctx != NULL );
 
-       if( ctx ) {
+       if( ctx != NULL ) {
                sasl_dispose( &ctx );
                lc->lconn_sasl_ctx = NULL;
        }
@@ -480,13 +487,15 @@ ldap_int_sasl_bind(
 
        if ( sd == AC_SOCKET_INVALID ) {
                /* not connected yet */
-               int rc = ldap_open_defconn( ld );
-  
+               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_UNAVAILABLE;
+                       ld->ld_errno = LDAP_LOCAL_ERROR;
                        return ld->ld_errno;
                }
        }   
@@ -494,7 +503,7 @@ ldap_int_sasl_bind(
        ctx = ld->ld_defconn->lconn_sasl_ctx;
 
        if( ctx == NULL ) {
-               ld->ld_errno = LDAP_UNAVAILABLE;
+               ld->ld_errno = LDAP_LOCAL_ERROR;
                return ld->ld_errno;
        }
 
@@ -555,6 +564,13 @@ ldap_int_sasl_bind(
                }
 
                if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
+                       if( scred ) {
+                               /* and server provided us with data? */
+                               Debug( LDAP_DEBUG_TRACE,
+                                       "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
+                                       rc, saslrc, scred->bv_len );
+                               ber_bvfree( scred );
+                       }
                        return ld->ld_errno;
                }
 
@@ -609,8 +625,6 @@ ldap_int_sasl_bind(
                return ld->ld_errno = sasl_err2ldap( saslrc );
        }
 
-       /* likely should add a quiet option */
-
        if( flags != LDAP_SASL_QUIET ) {
                saslrc = sasl_getprop( ctx, SASL_USERNAME, (void **) &data );
                if( saslrc == SASL_OK && data && *data ) {
@@ -641,6 +655,41 @@ ldap_int_sasl_bind(
        return rc;
 }
 
+int
+ldap_int_sasl_external(
+       LDAP *ld,
+       const char * authid,
+       ber_len_t ssf )
+{
+       int sc;
+       sasl_conn_t *ctx;
+       sasl_external_properties_t extprops;
+
+       if( ld->ld_defconn == NULL ) {
+               return LDAP_LOCAL_ERROR;
+       }
+
+       ctx = ld->ld_defconn->lconn_sasl_ctx;
+
+       if ( ctx == NULL ) {
+               return LDAP_LOCAL_ERROR;
+       }
+    
+       memset( &extprops, '\0', sizeof(extprops) );
+       extprops.ssf = ssf;
+       extprops.auth_id = (char *) authid;
+    
+       sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
+               (void *) &extprops );
+    
+       if ( sc != SASL_OK ) {
+               return LDAP_LOCAL_ERROR;
+       }
+
+       return LDAP_SUCCESS;
+}
+
+
 int ldap_pvt_sasl_secprops(
        const char *in,
        sasl_security_properties_t *secprops )
@@ -649,11 +698,11 @@ int ldap_pvt_sasl_secprops(
        char **props = ldap_str2charray( in, "," );
        unsigned sflags = 0;
        int got_sflags = 0;
-       sasl_ssf_t max_ssf;
+       sasl_ssf_t max_ssf = 0;
        int got_max_ssf = 0;
-       sasl_ssf_t min_ssf;
+       sasl_ssf_t min_ssf = 0;
        int got_min_ssf = 0;
-       unsigned maxbufsize;
+       unsigned maxbufsize = 0;
        int got_maxbufsize = 0;
 
        if( props == NULL || secprops == NULL ) {
@@ -692,7 +741,7 @@ int ldap_pvt_sasl_secprops(
                        "minssf=", sizeof("minssf")) )
                {
                        if( isdigit( props[i][sizeof("minssf")] ) ) {
-                               got_max_ssf++;
+                               got_min_ssf++;
                                min_ssf = atoi( &props[i][sizeof("minssf")] );
                        } else {
                                return LDAP_NOT_SUPPORTED;
@@ -940,4 +989,12 @@ ldap_int_sasl_bind(
        LDAP_SASL_INTERACT_PROC *interact,
        void * defaults )
 { return LDAP_NOT_SUPPORTED; }
+
+int
+ldap_int_sasl_external(
+       LDAP *ld,
+       const char * authid,
+       ber_len_t ssf )
+{ return LDAP_SUCCESS; }
+
 #endif /* HAVE_CYRUS_SASL */