Mercurial > noffle
comparison src/server.c @ 85:dfcb28566d36 noffle
[svn] Merged in changes from release-1-0 up to release-1-0-merge-1.
author | enz |
---|---|
date | Wed, 17 May 2000 11:51:22 +0100 |
parents | 1eb0cdd17c76 |
children | 1fcdced0246e |
comparison
equal
deleted
inserted
replaced
84:8c6dbce3b178 | 85:dfcb28566d36 |
---|---|
1 /* | 1 /* |
2 server.c | 2 server.c |
3 | 3 |
4 $Id: server.c 88 2000-05-14 16:15:08Z bears $ | 4 $Id: server.c 96 2000-05-17 10:51:22Z enz $ |
5 */ | 5 */ |
6 | 6 |
7 #if HAVE_CONFIG_H | 7 #if HAVE_CONFIG_H |
8 #include <config.h> | 8 #include <config.h> |
9 #endif | 9 #endif |
1118 if ( *p == '\0' ) | 1118 if ( *p == '\0' ) |
1119 { | 1119 { |
1120 inHeader = FALSE; | 1120 inHeader = FALSE; |
1121 if ( from[ 0 ] == '\0' ) | 1121 if ( from[ 0 ] == '\0' ) |
1122 Log_err( "Posted message has no From field" ); | 1122 Log_err( "Posted message has no From field" ); |
1123 if ( ! Cfg_removeMsgId() ) | 1123 if ( Cfg_replaceMsgId() ) |
1124 { | 1124 { |
1125 if ( Cfg_replaceMsgId() ) | 1125 Prt_genMsgId( msgId, from, "NOFFLE" ); |
1126 { | 1126 Log_dbg( "Replacing Message-ID with '%s'", msgId ); |
1127 Prt_genMsgId( msgId, from, "NOFFLE" ); | |
1128 Log_dbg( "Replacing Message-ID with '%s'", msgId ); | |
1129 } | |
1130 else if ( msgId[ 0 ] == '\0' ) | |
1131 { | |
1132 Prt_genMsgId( msgId, from, "NOFFLE" ); | |
1133 | |
1134 Log_inf( "Adding missing Message-ID '%s'", msgId ); | |
1135 } | |
1136 else if ( ! Prt_isValidMsgId( msgId ) ) | |
1137 { | |
1138 Log_ntc( "Replacing invalid Message-ID with '%s'", | |
1139 msgId ); | |
1140 Prt_genMsgId( msgId, from, "NOFFLE" ); | |
1141 } | |
1142 DynStr_app( s, "Message-ID: " ); | |
1143 DynStr_appLn( s, msgId ); | |
1144 } | 1127 } |
1128 else if ( msgId[ 0 ] == '\0' ) | |
1129 { | |
1130 Prt_genMsgId( msgId, from, "NOFFLE" ); | |
1131 | |
1132 Log_inf( "Adding missing Message-ID '%s'", msgId ); | |
1133 } | |
1134 else if ( ! Prt_isValidMsgId( msgId ) ) | |
1135 { | |
1136 Log_ntc( "Replacing invalid Message-ID with '%s'", | |
1137 msgId ); | |
1138 Prt_genMsgId( msgId, from, "NOFFLE" ); | |
1139 } | |
1140 DynStr_app( s, "Message-ID: " ); | |
1141 DynStr_appLn( s, msgId ); | |
1145 if ( ! replyToFound && from[ 0 ] != '\0' ) | 1142 if ( ! replyToFound && from[ 0 ] != '\0' ) |
1146 { | 1143 { |
1147 Log_dbg( "Adding Reply-To field to posted message." ); | 1144 Log_dbg( "Adding Reply-To field to posted message." ); |
1148 DynStr_app( s, "Reply-To: " ); | 1145 DynStr_app( s, "Reply-To: " ); |
1149 DynStr_appLn( s, from ); | 1146 DynStr_appLn( s, from ); |