ITS#5428

[openldap] / servers / slapd / overlays / translucent.c

diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 27715316d143b1083fdad2c46062378bf3a66fb2..146245dfb033bdb88d4f298f7e4ceecf54fd82c6 100644 (file)
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2007 The OpenLDAP Foundation.
+ * Copyright 2004-2008 The OpenLDAP Foundation.
  * Portions Copyright 2005 Symas Corporation.
  * All rights reserved.
  *
@@ -108,7 +108,7 @@ static ConfigOCs translucentocs[] = {
 static int
 translucent_ldadd_cleanup( ConfigArgs *ca )
 {
-       slap_overinst *on = ca->private;
+       slap_overinst *on = ca->ca_private;
        translucent_info *ov = on->on_bi.bi_private;
 
        ov->defer_db_open = 0;
@@ -130,7 +130,7 @@ translucent_ldadd( CfEntryInfo *cei, Entry *e, ConfigArgs *ca )
        on = (slap_overinst *)cei->ce_bi;
        ov = on->on_bi.bi_private;
        ca->be = &ov->db;
-       ca->private = on;
+       ca->ca_private = on;
        if ( CONFIG_ONLINE_ADD( ca ))
                ca->cleanup = translucent_ldadd_cleanup;
        else
@@ -605,7 +605,7 @@ static int translucent_compare(Operation *op, SlapReply *rs) {
 **
 */
        rc = overlay_entry_get_ov(op, &op->o_req_ndn, NULL, ava->aa_desc, 0, &e, on);
-       if(e && rc == LDAP_SUCCESS) {
+       if(rc == LDAP_SUCCESS && e) {
                overlay_entry_release_ov(op, e, 0, on);
                return(SLAP_CB_CONTINUE);
        }