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 f0f8875b5e71d035312a7ad40e17addd8b221289..3b35dd2fbedeead8de5fa82c2690054afde121d7 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -210,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;
        }
@@ -326,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;
 }
@@ -401,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;
        }
 
@@ -436,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;
        }
@@ -481,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;
                }
        }   
@@ -495,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;
        }
 
@@ -647,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 )
@@ -946,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 */