put config_file in cache_cf.c to set default

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index ba29d4b2fc072c0577ab1f504b86d417a32320b1..18cb0deebde463ef2778616b48ba89b5dcb9050f 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.45 1996/04/16 05:13:33 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.46 1996/04/16 05:48:57 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -174,7 +174,8 @@ int emulate_httpd_log = DefaultCommonLogFormat;             /* for fast access */
 time_t neighbor_timeout = DefaultNeighborTimeout;      /* for fast access */
 int single_parent_bypass = 0;
 int DnsPositiveTtl = DefaultPositiveDnsTtl;
-char *cfg_filename = NULL;
+char *config_file = DEFAULT_CONFIG_FILE;
+char *cfg_filename = NULL;     /* just the last part */
 
 char w_space[] = " \t\n";
 char config_input_line[BUFSIZ];

diff --git a/src/main.cc b/src/main.cc
index 3ea347f539fce1b914e1fe6e3bbcd39a5f96abcc..40eb471de1b545698e9d235cd01e9bb9e3b364af 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-/* $Id: main.cc,v 1.35 1996/04/16 05:05:25 wessels Exp $ */
+/* $Id: main.cc,v 1.36 1996/04/16 05:48:58 wessels Exp $ */
 
 /* DEBUG: Section 1             main: startup and main loop */
 
@@ -12,7 +12,6 @@ int do_reuse = 1;
 int opt_unlink_on_reload = 0;
 int catch_signals = 1;
 int do_dns_test = 1;
-char *config_file = NULL;
 int vhost_mode = 0;
 int unbuffered_logs = 1;       /* debug and hierarhcy unbuffered by default */
 int shutdown_pending = 0;      /* set by SIGTERM handler (shut_down()) */
@@ -289,9 +288,6 @@ int main(argc, argv)
     fd_note(1, "STDOUT");
     fd_note(2, "STDERR");
 
-    if (config_file == NULL)
-       config_file = xstrdup(DEFAULT_CONFIG_FILE);
-
     /* enable syslog by default */
     syslog_enable = 0;