Strip KillSent flag when storing netmail

This commit is contained in:
Michiel Broek 2001-12-07 20:12:02 +00:00
parent f5596ced3c
commit 2d6d902f2a
2 changed files with 7 additions and 10 deletions

View File

@ -4233,6 +4233,7 @@ v0.33.19 26-Oct-2001
can't start the bbs from telnet anymore! With a later release 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 this may change by adding a login wrapper, for now this is how
it works now. Take it or leave it. it works now. Take it or leave it.
Added German language file made by Harald Wuensch.
SETUP.sh SETUP.sh
Better grep to check for excisting usernames like bbs, mbse. Better grep to check for excisting usernames like bbs, mbse.
@ -4337,9 +4338,12 @@ v0.33.19 26-Oct-2001
mbfido: mbfido:
When running in mbmail mode, it will try to get the lock on 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 Fixed the problem that the KillSent flag was set on processed
netmail. 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- The tic file import function now sorts and tests on long file-
names, with the new mangle function an DOS 8.3 filename is names, with the new mangle function an DOS 8.3 filename is
also stored in the file database. also stored in the file database.

View File

@ -1,8 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: tosser/storenet.c * $Id$
* Purpose ...............: Import a netmail message * Purpose ...............: Import a netmail message in the message base.
* Last modification date : 22-Oct-2001
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2001 * 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)) { if (Msg_Lock(30L)) {
Msg_New(); Msg_New();
Syslog('m', "Flagfield 0x%04x", flags); Syslog('m', "Flagfield 0x%04x", flags);
strcpy(Msg.From, f->name); strcpy(Msg.From, f->name);
strcpy(Msg.To, usr.sUserName); 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.Intransit = ((flags & M_TRANSIT));
Msg.FileRequest = ((flags & M_REQ) || flag_on((char *)"FRQ", flagstr)); Msg.FileRequest = ((flags & M_REQ) || flag_on((char *)"FRQ", flagstr));
Msg.ReceiptRequest = ((flags & M_RRQ) || flag_on((char *)"RRQ", 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.Immediate = flag_on((char *)"IMM", flagstr);
Msg.Direct = flag_on((char *)"DIR", flagstr); Msg.Direct = flag_on((char *)"DIR", flagstr);
Msg.Gate = flag_on((char *)"ZON", 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.ConfirmRequest = ((flags & M_AUDIT) || flag_on((char *)"CFM", flagstr));
Msg.Orphan = ((flags & M_ORPHAN)); Msg.Orphan = ((flags & M_ORPHAN));