streamline group attr specification/diagnostics

[openldap] / servers / slapd / sets.c

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index 50a4d0d56ef5909eb3627fecbe98be586427a743..22ec84f0556aa02033afaeb1a53163be411719b0 100644 (file)
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -265,10 +265,14 @@ slap_set_join(
 
 done:;
        if ( !( op_flags & SLAP_SET_LREFARR ) && lset != NULL ) {
+               if ( !( op_flags & SLAP_SET_LREFVAL ))
+                       cp->set_op->o_tmpfree( lset->bv_val, cp->set_op->o_tmpmemctx );
                cp->set_op->o_tmpfree( lset, cp->set_op->o_tmpmemctx );
        }
 
        if ( !( op_flags & SLAP_SET_RREFARR ) && rset != NULL ) {
+               if ( !( op_flags & SLAP_SET_RREFVAL ))
+                       cp->set_op->o_tmpfree( rset->bv_val, cp->set_op->o_tmpmemctx );
                cp->set_op->o_tmpfree( rset, cp->set_op->o_tmpmemctx );
        }