Import latest release as a temporary trunk which should be

later merged into a branch with the full history from
CVS and arch

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 7f3cd3926..720c96e93 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -304,6 +304,7 @@ void log_message(const char *fmt, ...) {
       return;
     }
     setlinebuf(logfd);
+    setcloexec(fileno(logfd), log_file);
   }
 
   if (!log) {
diff --git a/lib/ehandle.c b/lib/ehandle.c
index 7b6c09bca..f49458265 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -132,6 +132,8 @@ static void run_cleanups(struct errorcontext *econ, int flagsetin) {
         econtext= oldecontext;
       }
     }
+    flagset &= cep->cpmask;
+    flagset |= cep->cpvalue;
     ncep= cep->next;
     if (cep != &emergency.ce) free(cep);
     cep= ncep;
@@ -207,8 +209,6 @@ void pop_cleanup(int flagset) {
   for (i=0; i<NCALLS; i++) {
     if (cep->calls[i].call && cep->calls[i].mask & flagset)
       cep->calls[i].call(cep->argc,cep->argv);
-    flagset &= cep->cpmask;
-    flagset |= cep->cpvalue;
   }
   if (cep != &emergency.ce) free(cep);
 }