ITS#3671 make sure to flush queue when able

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

diff --git a/servers/slapd/overlays/lastmod.c b/servers/slapd/overlays/lastmod.c
index 5594f2de32cf0a4574c9a5f2e7910016920265f6..a645f7d8b49eb425bf22cdc6d7e69a6e21d5b120 100644 (file)
--- a/servers/slapd/overlays/lastmod.c
+++ b/servers/slapd/overlays/lastmod.c
@@ -1,7 +1,7 @@
 /* lastmod.c - returns last modification info */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -308,19 +308,6 @@ lastmod_op_func( Operation *op, SlapReply *rs )
                        return lastmod_exop( op, rs );
 
                case LDAP_REQ_MODIFY:
-                       /* if global overlay, modlist is not checked yet */
-                       if ( op->orm_modlist->sml_desc == NULL ) {
-                               char textbuf[SLAP_TEXT_BUFLEN];
-                               size_t textlen = sizeof textbuf;
-
-                               rs->sr_err = slap_mods_check( op->orm_modlist, 0, &rs->sr_text,
-                                               textbuf, textlen, NULL );
-
-                               if ( rs->sr_err ) {
-                                       goto return_error;
-                               }
-                       }
-
                        /* allow only changes to overlay status */
                        for ( ml = op->orm_modlist; ml; ml = ml->sml_next ) {
                                if ( ad_cmp( ml->sml_desc, slap_schema.si_ad_modifiersName ) != 0
@@ -794,7 +781,7 @@ lastmod_db_init(
                                return -1;
                        }
        
-                       code = at_add(at, &err);
+                       code = at_add(at, 0, NULL, &err);
                        if ( code ) {
                                Debug( LDAP_DEBUG_ANY, "lastmod_init: "
                                        "%s in attributeType '%s'\n",
@@ -837,7 +824,7 @@ lastmod_db_init(
                                return -1;
                        }
 
-                       code = oc_add(oc, 0, &err);
+                       code = oc_add(oc, 0, NULL, &err);
                        if ( code ) {
                                Debug( LDAP_DEBUG_ANY,
                                        "objectClass '%s': %s \"%s\"\n" ,