]> git.sur5r.net Git - openldap/commitdiff
Minor cleanup
authorHoward Chu <hyc@openldap.org>
Wed, 12 Jan 2011 22:53:43 +0000 (22:53 +0000)
committerHoward Chu <hyc@openldap.org>
Wed, 12 Jan 2011 22:53:43 +0000 (22:53 +0000)
servers/slapd/back-monitor/search.c

index a7aad3bd1049ad15bc1c775f2c413accfd9d2e02..f567618ed0b2259ff228adaa5634d45ee6174085 100644 (file)
@@ -60,8 +60,7 @@ monitor_send_children(
                if ( e == NULL ) {
                        return LDAP_SUCCESS;
                }
-               nonvolatile = 1;
-       
+
        /* volatile entries */
        } else {
                /* if no persistent, return only volatile */
@@ -88,6 +87,9 @@ monitor_send_children(
        for ( monitor_cache_lock( e ); e != NULL; ) {
                monitor_entry_update( op, rs, e );
 
+               if ( e == e_nonvolatile )
+                       nonvolatile = 1;
+
                mp = ( monitor_entry_t * )e->e_private;
                e_tmp = mp->mp_next;
 
@@ -142,9 +144,6 @@ freeout:
                }
 
                e = e_tmp;
-               if ( e == e_nonvolatile ) {
-                       nonvolatile = 1;
-               }
        }
        
        return LDAP_SUCCESS;