Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / slapi / slapi_overlay.c

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index ad23153e22ce56376d4f95ecf7681b36b0e16c94..11d0098ae511185793b67de3b3a0c6d6d064b460 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2013 The OpenLDAP Foundation.
+ * Copyright 2001-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,11 +454,11 @@ slapi_over_merge_controls( Operation *op, SlapReply *rs )
        n_slapi_ctrls = slapi_int_count_controls( slapi_ctrls );
        n_rs_ctrls = slapi_int_count_controls( rs->sr_ctrls );
 
-       slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
-
        if ( n_slapi_ctrls == 0 )
                return LDAP_SUCCESS; /* no SLAPI controls */
 
+       slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
+
        ctrls = (LDAPControl **) op->o_tmpalloc(
                ( n_slapi_ctrls + n_rs_ctrls + 1 ) * sizeof(LDAPControl *),
                op->o_tmpmemctx );