--- ../org-src/post.c	Mon Aug  3 19:37:51 1998
+++ post.c	Tue Jun 15 09:57:39 1999
@@ -130,11 +130,14 @@
 		return FALSE;
 	}
 	PostsReceived++;
+
+/* Why not leave it to the upstream? [ekb 19990615]
 	if (!*messageid)
 	{
 		addmsgid = 1;
 		GenMessageID (messageid);
 	}
+*/
 	for (post_cfg = NULL, group = strtok (newsgroups, ","); group; group = strtok (NULL, ","))
 	{
 		struct group_cfg *gcf;
@@ -215,8 +218,13 @@
 				body = TRUE;
 				if (addmsgid)
 					Cfemitf (cf, "Message-ID: %s\r\n", messageid);
+/* Just leave them out [ekb 19990615]
 				Cfemitf (cf, "Cache-Post-Path: %s!%s\r\n", Host, ClientHost);
 				Cfemitf (cf, "X-Cache: nntpcache " VERSION " (see http://www.nntpcache.org/)\r\n");
+*/
+/* But print an additional X-NNTP-Posting-Host header to log
+   the actual connecting client machine (address only) [ekb 19990615] */
+				Cfemitf (cf, "X-NNTP-Posting-Host: %s\r\n", ClientHostAddr);
 			}
 			Cfemit (cf, art->data);
 		}