Merge remote-tracking branch 'origin/mdb.master'

[openldap] / contrib / slapd-modules / usn / usn.c

diff --git a/contrib/slapd-modules/usn/usn.c b/contrib/slapd-modules/usn/usn.c
index a16e60522ebeeec7850d1c8247ef434beb1738da..3fa87b1740691e38b1b1af01052798b8bc903063 100644 (file)
--- a/contrib/slapd-modules/usn/usn.c
+++ b/contrib/slapd-modules/usn/usn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2007-2008 The OpenLDAP Foundation.
+ * Copyright 2007-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -135,10 +135,7 @@ usn_operational(
                                }
 
                        if ( !ap ) {
-                               if ( !rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
-                                       rs->sr_entry = entry_dup( rs->sr_entry );
-                                       rs->sr_flags |=
-                                               REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
+                               if ( rs_entry2modifiable( op,rs, on )) {
                                        a = attr_find( rs->sr_entry->e_attrs,
                                                ad_usnChanged );
                                }
@@ -233,7 +230,6 @@ usn_db_close(
        void *thrctx;
 
        Modifications mod;
-       SlapReply rsm = { 0 };
        slap_callback cb = {0};
        char intbuf[64];
        struct berval bv[2];