DW:

 - diskd magic constants got moved to 'cache_dir' line.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 1c33697401227495906dfaaca67335942fddb55c..953ef99e5a4d00ce897fa79855e45330c7829fd3 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.180 2000/05/03 19:36:37 hno Exp $
+# $Id: cf.data.pre,v 1.181 2000/05/12 03:11:40 wessels Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -3132,21 +3132,5 @@ DOC_START
        disable persistent connections with clients and/or servers.
 DOC_END
 
-NAME: diskd_magic1
-IFDEF: USE_DISKD
-TYPE: int
-LOC: Config.diskd.magic1
-DEFAULT: 64
-DOC_NONE
-
-NAME: diskd_magic2
-IFDEF: USE_DISKD
-TYPE: int
-LOC: Config.diskd.magic2
-DEFAULT: 72
-DOC_START
-       Macic constants for the diskd daemon..
-DOC_END
-
 EOF
 

diff --git a/src/structs.h b/src/structs.h
index 064d4c47dbfc7da6fbc99cb3d2780925e1ecd467..df951909c86ef7bc947c9e80e0b5ae0d8f2bc83f 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.331 2000/05/12 00:29:09 wessels Exp $
+ * $Id: structs.h,v 1.332 2000/05/12 03:11:40 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -494,12 +494,6 @@ struct _SquidConfig {
        int rebuild_chunk_percentage;
     } digest;
 #endif
-#if USE_DISKD
-    struct {
-       int magic1;
-       int magic2;
-    } diskd;
-#endif
 };
 
 struct _SquidConfig2 {