From: wessels <>
Date: Thu, 2 May 1996 04:38:55 +0000 (+0000)
Subject: support for RFC931/ident
X-Git-Tag: SQUID_3_0_PRE1~6099
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0c09e11da5def79cfa88f7d4890e675069cc773;p=thirdparty%2Fsquid.git

support for RFC931/ident
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 26f66e36ab..488e1c78f3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.23 1996/05/01 22:36:23 wessels Exp $
+#  $Id: Makefile.in,v 1.24 1996/05/01 22:38:55 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -45,7 +45,7 @@ CGIPROGS	= cachemgr.cgi
 OBJS	 	= acl.o background.o cache_cf.o errorpage.o comm.o \
 		connect.o debug.o disk.o dynamic_array.o \
 		fdstat.o filemap.o ftp.o gopher.o \
-		hash.o http.o icp.o ipcache.o \
+		hash.o http.o icp.o ident.o ipcache.o \
 		main.o mime.o neighbors.o objcache.o \
 		proto.o send-announce.o stack.o stat.o stmem.o \
 		store.o storetoString.o tools.o ttl.o \
diff --git a/src/stat.cc b/src/stat.cc
index bb4ea1911a..5a748830e0 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,4 +1,4 @@
-/* $Id: stat.cc,v 1.32 1996/05/01 22:37:13 wessels Exp $ */
+/* $Id: stat.cc,v 1.33 1996/05/01 22:38:57 wessels Exp $ */
 
 /*
  * DEBUG: Section 18          stat
@@ -655,7 +655,7 @@ void parameter_get(obj, sentry)
 }
 
 
-void log_append(obj, url, id, size, action, method, http_code, msec)
+void log_append(obj, url, id, size, action, method, http_code, msec, ident)
      cacheinfo *obj;
      char *url;
      char *id;
@@ -664,6 +664,7 @@ void log_append(obj, url, id, size, action, method, http_code, msec)
      char *method;
      int http_code;
      int msec;
+     char *ident;
 {
     static char tmp[6000];	/* MAX_URL is 4096 */
     char *buf = NULL;
@@ -690,13 +691,15 @@ void log_append(obj, url, id, size, action, method, http_code, msec)
 	method = "-";
     if (!url)
 	url = "-";
+    if (!ident || ident[0] == '\0')
+	ident = "-";
 
     if (obj->logfile_status == LOG_ENABLE) {
 	if (emulate_httpd_log)
 	    sprintf(tmp, "%s - - [%s] \"%s %s\" %s %d\n",
 		id, mkhttpdlogtime(&squid_curtime), method, url, action, size);
 	else
-	    sprintf(tmp, "%9d.%03d %6d %s %s/%03d %d %s %s\n",
+	    sprintf(tmp, "%9d.%03d %6d %s %s/%03d %d %s %s %s\n",
 		(int) current_time.tv_sec,
 		(int) current_time.tv_usec / 1000,
 		msec,
@@ -705,7 +708,8 @@ void log_append(obj, url, id, size, action, method, http_code, msec)
 		http_code,
 		size,
 		method,
-		url);
+		url,
+		ident);
 
 
 	if (file_write(obj->logfile_fd, buf = xstrdup(tmp), strlen(tmp),