do incremental updates correctly

diff --git a/server/mr_glue.c b/server/mr_glue.c
index a7b4d80a1c911888fe52ccd705ccf01e374011bf..e18aa8bf62673f3fbd15b56e15c8cab12a7bd418 100644 (file)
--- a/server/mr_glue.c
+++ b/server/mr_glue.c
@@ -129,8 +129,10 @@ int mr_query(name, argc, argv, callproc, callarg)
     time(&now);
     hints.proc = callproc;
     hints.hint = callarg;
+    next_incremental();
     return mr_process_query(&pseudo_client, name, argc, argv,
                             callback, &hints);
+
 }
 
 int mr_access(name, argc, argv)
@@ -153,6 +155,7 @@ int mr_query_internal(argc, argv, callproc, callarg)
     time(&now);
     hints.proc = callproc;
     hints.hint = callarg;
+    next_incremental();
     return mr_process_query(&pseudo_client, argv[0], argc-1, argv+1,
                             callback, &hints);
 }
@@ -213,6 +216,8 @@ void reapchild()
     int pid;
 
     while ((pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0) {
+       if (pid == inc_pid)
+         next_incremental();
        if  (status.w_termsig != 0 || status.w_retcode != 0)
          com_err(whoami, 0, "%d: child exits with signal %d status %d",
                  pid, status.w_termsig, status.w_retcode);