ITS#3846 don't give hashed passwords to SASL, it only wants cleartext.

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index e65fd4d7ad9c5e3dd3411d26128e7ce6cdf23077..b6a4ae0e54c969a0584b87fcfd85db5d3a2f189a 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -39,6 +39,8 @@
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
 static LDAP_STAILQ_HEAD(s_o, slap_op)  slap_free_ops;
+static time_t last_time;
+static int last_incr;
 
 void slap_op_init(void)
 {
@@ -68,13 +70,13 @@ slap_op_free( Operation *op )
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
        }
-       if ( op->o_dn.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_dn ) ) {
                free( op->o_dn.bv_val );
        }
-       if ( op->o_ndn.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_ndn ) ) {
                free( op->o_ndn.bv_val );
        }
-       if ( op->o_authmech.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_authmech ) ) {
                free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
@@ -89,9 +91,9 @@ slap_op_free( Operation *op )
 
        {
                GroupAssertion *g, *n;
-               for (g = op->o_groups; g; g=n) {
+               for ( g = op->o_groups; g; g = n ) {
                        n = g->ga_next;
-                       slap_sl_free(g, op->o_tmpmemctx);
+                       slap_sl_free( g, op->o_tmpmemctx );
                }
                op->o_groups = NULL;
        }
@@ -142,6 +144,12 @@ slap_op_alloc(
        op->o_tag = tag;
 
        op->o_time = slap_get_time();
+       if ( op->o_time == last_time ) {
+               op->o_tincr = ++last_incr;
+       } else {
+               last_time = op->o_time;
+               last_incr = 0;  /* o_tincr is alredy zero */
+       }
        op->o_opid = id;
        op->o_res_ber = NULL;