# HG changeset patch
# User enz
# Date 958560682 -3600
# Node ID dfcb28566d3676ec26f3f9caef7247147964056e
# Parent  8c6dbce3b178fb3d585f06fcc2c736a73e06e25d
[svn] Merged in changes from release-1-0 up to release-1-0-merge-1.

diff -r 8c6dbce3b178 -r dfcb28566d36 docs/noffle.conf.5
--- a/docs/noffle.conf.5	Wed May 17 11:42:48 2000 +0100
+++ b/docs/noffle.conf.5	Wed May 17 11:51:22 2000 +0100
@@ -1,5 +1,6 @@
 .TH noffle.conf 5
-.\" $Id: noffle.conf.5 95 2000-05-17 10:42:48Z enz $
+.\" $Id: noffle.conf.5 96 2000-05-17 10:51:22Z enz $
+
 .SH NAME
 noffle.conf \- Configuration file for NOFFLE news server
 
diff -r 8c6dbce3b178 -r dfcb28566d36 src/configfile.h
--- a/src/configfile.h	Wed May 17 11:42:48 2000 +0100
+++ b/src/configfile.h	Wed May 17 11:51:22 2000 +0100
@@ -3,7 +3,7 @@
 
   Common declarations and handling of the configuration file.
 
-  $Id: configfile.h 88 2000-05-14 16:15:08Z bears $
+  $Id: configfile.h 96 2000-05-17 10:51:22Z enz $
 */
 
 #ifndef CONFIGFILE_H
@@ -25,7 +25,10 @@
 Bool Cfg_autoUnsubscribe( void );
 Bool Cfg_autoSubscribe( void );
 Bool Cfg_infoAlways( void );
+
+/* Ignored. Should be removed in development version. */
 Bool Cfg_removeMsgId( void );
+
 Bool Cfg_replaceMsgId( void );
 const char * Cfg_autoSubscribeMode( void ); /* Can be: full, thread, over */
 const char * Cfg_mailTo( void );
diff -r 8c6dbce3b178 -r dfcb28566d36 src/server.c
--- a/src/server.c	Wed May 17 11:42:48 2000 +0100
+++ b/src/server.c	Wed May 17 11:51:22 2000 +0100
@@ -1,7 +1,7 @@
 /*
   server.c
 
-  $Id: server.c 88 2000-05-14 16:15:08Z bears $
+  $Id: server.c 96 2000-05-17 10:51:22Z enz $
 */
 
 #if HAVE_CONFIG_H
@@ -1120,28 +1120,25 @@
                 inHeader = FALSE;
                 if ( from[ 0 ] == '\0' )
                     Log_err( "Posted message has no From field" );
-                if ( ! Cfg_removeMsgId() )
+                if ( Cfg_replaceMsgId() )
+                {
+                    Prt_genMsgId( msgId, from, "NOFFLE" );
+                    Log_dbg( "Replacing Message-ID with '%s'", msgId );
+                }
+                else if ( msgId[ 0 ] == '\0' )
                 {
-                    if ( Cfg_replaceMsgId() )
-                    {
-                        Prt_genMsgId( msgId, from, "NOFFLE" );
-                        Log_dbg( "Replacing Message-ID with '%s'", msgId );
-                    }
-                    else if ( msgId[ 0 ] == '\0' )
-                    {
-                        Prt_genMsgId( msgId, from, "NOFFLE" );
-
-                        Log_inf( "Adding missing Message-ID '%s'", msgId );
-                    }
-                    else if ( ! Prt_isValidMsgId( msgId ) )
-                    {
-                        Log_ntc( "Replacing invalid Message-ID with '%s'",
-                                 msgId );
-                        Prt_genMsgId( msgId, from, "NOFFLE" );
-                    }
-                    DynStr_app( s, "Message-ID: " );
-                    DynStr_appLn( s, msgId );
+                    Prt_genMsgId( msgId, from, "NOFFLE" );
+                    
+                    Log_inf( "Adding missing Message-ID '%s'", msgId );
                 }
+                else if ( ! Prt_isValidMsgId( msgId ) )
+                {
+                    Log_ntc( "Replacing invalid Message-ID with '%s'",
+                             msgId );
+                    Prt_genMsgId( msgId, from, "NOFFLE" );
+                }
+                DynStr_app( s, "Message-ID: " );
+                DynStr_appLn( s, msgId );
                 if ( ! replyToFound && from[ 0 ] != '\0' )
                 {
                     Log_dbg( "Adding Reply-To field to posted message." );