From 2d6d902f2af2ced522006cf685ae3c64e9e5d149 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Fri, 7 Dec 2001 20:12:02 +0000 Subject: [PATCH] Strip KillSent flag when storing netmail --- ChangeLog | 6 +++++- mbfido/storenet.c | 11 ++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 860d21f1..be8da289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4233,6 +4233,7 @@ v0.33.19 26-Oct-2001 can't start the bbs from telnet anymore! With a later release this may change by adding a login wrapper, for now this is how it works now. Take it or leave it. + Added German language file made by Harald Wuensch. SETUP.sh Better grep to check for excisting usernames like bbs, mbse. @@ -4337,9 +4338,12 @@ v0.33.19 26-Oct-2001 mbfido: When running in mbmail mode, it will try to get the lock on - the program for 10 minutes before aborting. + the program for 10 minutes before aborting and waits until + another mbfido program is ready. Fixed the problem that the KillSent flag was set on processed netmail. + Reset the KillSent and Hold flags when storing netmail in the + message base. The tic file import function now sorts and tests on long file- names, with the new mangle function an DOS 8.3 filename is also stored in the file database. diff --git a/mbfido/storenet.c b/mbfido/storenet.c index 9638644a..e2cce9de 100644 --- a/mbfido/storenet.c +++ b/mbfido/storenet.c @@ -1,8 +1,7 @@ /***************************************************************************** * - * File ..................: tosser/storenet.c - * Purpose ...............: Import a netmail message - * Last modification date : 22-Oct-2001 + * $Id$ + * Purpose ...............: Import a netmail message in the message base. * ***************************************************************************** * Copyright (C) 1997-2001 @@ -79,7 +78,6 @@ int storenet(faddr *f, faddr *t, time_t mdate, int flags, char *Subj, char *msgi if (Msg_Lock(30L)) { Msg_New(); - Syslog('m', "Flagfield 0x%04x", flags); strcpy(Msg.From, f->name); strcpy(Msg.To, usr.sUserName); @@ -102,14 +100,9 @@ int storenet(faddr *f, faddr *t, time_t mdate, int flags, char *Subj, char *msgi Msg.Intransit = ((flags & M_TRANSIT)); Msg.FileRequest = ((flags & M_REQ) || flag_on((char *)"FRQ", flagstr)); Msg.ReceiptRequest = ((flags & M_RRQ) || flag_on((char *)"RRQ", flagstr)); - Msg.KillSent = ((flags & M_KILLSENT) || flag_on((char *)"K/S", flagstr)); - Msg.ArchiveSent = flag_on((char *)"A/S", flagstr); - Msg.Hold = ((flags & M_HOLD) || flag_on((char *)"HLD", flagstr)); Msg.Immediate = flag_on((char *)"IMM", flagstr); Msg.Direct = flag_on((char *)"DIR", flagstr); Msg.Gate = flag_on((char *)"ZON", flagstr); - Msg.TruncFile = flag_on((char *)"TFS", flagstr); - Msg.KillFile = flag_on((char *)"KFS", flagstr); Msg.ConfirmRequest = ((flags & M_AUDIT) || flag_on((char *)"CFM", flagstr)); Msg.Orphan = ((flags & M_ORPHAN));