Removed the cf/sherlock2 hack (will move the config files in a minute).

Also fixed a bug in parsing Includes. Robert, please verify the fix,
I am not sure I've done the right thing.

diff --git a/lib/conf2.c b/lib/conf2.c
index 72a47929e7533568e0ef9d94891558ef49275b58..dad7399e1515d3363f1a434c8aab44ba1cce6803 100644 (file)
--- a/lib/conf2.c
+++ b/lib/conf2.c
@@ -1326,6 +1326,7 @@ parse_fastbuf(byte *name_fb, struct fastbuf *fb, uns depth)
        goto error;
       line_num = ll;
       parse_fb = fb;
+      continue;
     }
     enum cf_operation op;
     byte *c = strchr(name, ':');
@@ -1359,9 +1360,6 @@ error:
   return "included from here";
 }
 
-#undef DEFAULT_CONFIG                  /* FIXME */
-#define DEFAULT_CONFIG "cf/sherlock2"
-
 #ifndef DEFAULT_CONFIG
 #define DEFAULT_CONFIG NULL
 #endif