From e2030a7907fb7df61cc84a907ef803643bef4898 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sun, 4 Jul 2004 13:00:14 +0000
Subject: [PATCH] Fixed auto creation of newsgroup names in echomail areas

---
 ChangeLog         | 7 +++++++
 mbsetup/m_marea.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 263ce5b0..044ed196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ $Id$
 
 v0.61.1		20-Jun-2004.
 
+	upgrade:
+		If you compiled with ./configure --enable-newsgate you may
+		need to erase the newsgroup names in the echomail areas you
+		don't want to gate to news.
+
 	general:
 		Added compile directive for full newsgate. If this switch is
 		used then mbfido behaves like it did upto version 0.50.0 and
@@ -20,6 +25,8 @@ v0.61.1		20-Jun-2004.
 
 	mbsetup:
 		Added user@domain login for pop3 servers in screen 1.12.
+		Added compile directive for full newsgate to prevent newsgroup
+		name creation in default compiled mode.
 
 
 v0.61.0		06-Jun-2004 - 20-Jun-2004
diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c
index 06f4c672..6cf53ae1 100644
--- a/mbsetup/m_marea.c
+++ b/mbsetup/m_marea.c
@@ -242,6 +242,7 @@ int OpenMsgarea(void)
 		}
 		if ((int)msgs.Created == 0) {
 		    msgs.Created = start;
+#ifndef	USE_NEWSGATE
 		    if ((strlen(msgs.Newsgroup) == 0) && (msgs.Type == ECHOMAIL) && strlen(msgs.Group)) {
 			sprintf(msgs.Newsgroup, "%s.%s", GetFidoDomain(msgs.Aka.zone), msgs.Tag);
 			for (i = 0; i < strlen(msgs.Newsgroup); i++) {
@@ -251,6 +252,7 @@ int OpenMsgarea(void)
 			}
 			Syslog('+', "Area %s created newsgroup name %s", msgs.Tag, msgs.Newsgroup);
 		    }
+#endif
 		}
 		fwrite(&msgs, sizeof(msgs), 1, fout);
 		memset(&msgs, 0, sizeof(msgs));