[netfilter-cvslog] r3530 - in trunk/nfsim: core kernelenv

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-31 09:37:27 +0100 (Fri, 31 Dec 2004)
New Revision: 3530

Modified:
   trunk/nfsim/core/core.c
   trunk/nfsim/kernelenv/proc_stuff.c
Log:
Suppress failtest in proc_cleanup itself: there's another path (through tui.c)


Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2004-12-31 08:32:28 UTC (rev 3529)
+++ trunk/nfsim/core/core.c	2004-12-31 08:37:27 UTC (rev 3530)
@@ -407,7 +407,6 @@
 	}
 
 	/* Don't do failures during initialization. */
-	suppress_failtest++;
 	kernelenv_init();
 
 	run_inits();

Modified: trunk/nfsim/kernelenv/proc_stuff.c
===================================================================
--- trunk/nfsim/kernelenv/proc_stuff.c	2004-12-31 08:32:28 UTC (rev 3529)
+++ trunk/nfsim/kernelenv/proc_stuff.c	2004-12-31 08:37:27 UTC (rev 3530)
@@ -950,10 +950,12 @@
 void proc_cleanup(void)
 {
 	if (ignore_proc_issues) {
+		suppress_failtest++;
 		/* Free and reinitialize, so it's like before. */
 		talloc_free(__proc_ctx);
 		memset(&proc_root, 0, sizeof(proc_root));
 		proc_init();
+		suppress_failtest--;
 	}
 }