X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Ffileinit.c;h=b3c3129290e661dd7c6caf6206b975933b4fef21;hp=053d458e95b80b48d03dcfc409d91603393b5e47;hb=c6d3f68bbb6c7d9e9731ecbefdf09b06088ed472;hpb=c27564c0a967b2fd895b51b1f3d784fdf7b055d5

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 053d458e9..b3c312929 100644
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2011
  */
 
 #include <config.h>
@@ -60,7 +60,7 @@ static void ef_close_srv(void);
  * Initialize empfile for full server operations.
  */
 void
-ef_init_srv(void)
+ef_init_srv(int force_bad_state)
 {
     unsigned i;
 
@@ -71,11 +71,14 @@ ef_init_srv(void)
     }
 
     nsc_init();
-    ef_open_srv();
     if (ef_verify_config() < 0)
 	exit(EXIT_FAILURE);
-    if (ef_verify_state(1) < 0)
+    ef_open_srv();
+    if (ef_verify_state(1) < 0 && !force_bad_state) {
+	fprintf(stderr, "You can try -F to force running anyway,"
+		" but that's risky; see the manual page\n");
 	exit(EXIT_FAILURE);
+    }
     global_init();
     unit_cargo_init();
 }