From: wessels <>
Date: Mon, 22 Jul 1996 23:19:50 +0000 (+0000)
Subject: add opt_log_fqdn
X-Git-Tag: SQUID_3_0_PRE1~6012
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c82dc1a4f8a30d16a4506a943de87539f3dad3c;p=thirdparty%2Fsquid.git

add opt_log_fqdn
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index f50e47836e..27d3b34c8d 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.61 1996/07/18 20:25:37 wessels Exp $
+ * $Id: cache_cf.cc,v 1.62 1996/07/22 17:19:50 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -142,6 +142,7 @@ static struct {
 	char *hierarchy;
 	char *store;
 	int rotateNumber;
+	int log_fqdn;
     } Log;
     char *adminEmail;
     char *effectiveUser;
@@ -1424,6 +1425,9 @@ int parseConfigFile(file_name)
 	else if (!strcmp(token, "client_netmask"))
 	    parseAddressLine(&Config.Addrs.client_netmask);
 
+	else if (!strcmp(token, "log_fqdn"))
+	    parseOnOff(&Config.Log.log_fqdn);
+
 	else if (!strcmp(token, "bind_address"))
 	    parseAddressLine(&Config.Addrs.tcp_incoming);
 
@@ -1942,6 +1946,7 @@ static void configDoConfigure()
     sprintf(ForwardedBy, "Forwarded: by http://%s:%d/",
 	getMyHostname(), getHttpPortNum());
     do_redirect = getRedirectProgram()? 1 : 0;
+    opt_log_fqdn = Config.Log.log_fqdn;
 
 
 #if !ALLOW_HOT_CACHE
diff --git a/src/main.cc b/src/main.cc
index 199bd10ce3..c01efd0338 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: main.cc,v 1.53 1996/07/22 16:40:27 wessels Exp $
+ * $Id: main.cc,v 1.54 1996/07/22 17:19:51 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -124,6 +124,7 @@ char version_string[] = SQUID_VERSION;
 char appname[] = "squid";
 char localhost[] = "127.0.0.1";
 struct in_addr local_addr;
+int opt_log_fqdn = 1;
 
 /* for error reporting from xmalloc and friends */
 extern void (*failure_notify) _PARAMS((char *));
diff --git a/src/squid.h b/src/squid.h
index 797ce7f877..586f38b1a3 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.31 1996/07/22 16:40:29 wessels Exp $
+ * $Id: squid.h,v 1.32 1996/07/22 17:19:52 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -267,6 +267,7 @@ extern int opt_unlink_on_reload;	/* main.c */
 extern int opt_reload_hit_only;	/* main.c */
 extern int opt_dns_tests;	/* main.c */
 extern int opt_foreground_rebuild;	/* main.c */
+extern int opt_log_fqdn;	/* main.c */
 extern int vhost_mode;		/* main.c */
 extern char version_string[];	/* main.c */
 extern char appname[];		/* main.c */