ITS#8796 Fix SSF reset

Maintain the SSF across SASL binds.

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 934e92239d44822aa7f0814217ce6f364ab6032e..7ae580a32cdb7a7357836f62200a6542df1e0640 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1643,11 +1643,16 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
        if ( !op->o_conn->c_sasl_bind_in_progress ) {
                /* If we already authenticated once, must use a new context */
                if ( op->o_conn->c_sasl_done ) {
-                       sasl_ssf_t *ssf = NULL;
+                       sasl_ssf_t ssf = 0;
+                       sasl_ssf_t *ssfp = NULL;
                        const char *authid = NULL;
-                       sasl_getprop( ctx, SASL_SSF_EXTERNAL, (void *)&ssf );
+
+                       sasl_getprop( ctx, SASL_SSF_EXTERNAL, (void *)&ssfp );
+                       if ( ssfp ) ssf = *ssfp;
+
                        sasl_getprop( ctx, SASL_AUTH_EXTERNAL, (void *)&authid );
                        if ( authid ) authid = ch_strdup( authid );
+
                        if ( ctx != op->o_conn->c_sasl_sockctx ) {
                                sasl_dispose( &ctx );
                        }
@@ -1655,8 +1660,8 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
                                
                        slap_sasl_open( op->o_conn, 1 );
                        ctx = op->o_conn->c_sasl_authctx;
+                       sasl_setprop( ctx, SASL_SSF_EXTERNAL, &ssf );
                        if ( authid ) {
-                               sasl_setprop( ctx, SASL_SSF_EXTERNAL, ssf );
                                sasl_setprop( ctx, SASL_AUTH_EXTERNAL, authid );
                                ch_free( (char *)authid );
                        }