bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for killsent flag

Browse Source
This commit is contained in:
Michiel Broek 2001-11-16 20:07:42 +00:00
parent 5f06e6e421
commit a1d9bd4216
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4243,6 +4243,8 @@ v0.33.19 26-Oct-2001
Added setup item for menus 317 and 318. Added setup item for menus 317 and 318.
Changed the order of menu 1, global settings. The screens are Changed the order of menu 1, global settings. The screens are
now in a more logical order for a first system setup. now in a more logical order for a first system setup.
Most datafiles are now saved mode 0640 exept the files that
need to be rewritten by users, they have mode 0660.
mbsebbs: mbsebbs:
Added menu 317, change FS editor shortcut keys to (Emacs/ Added menu 317, change FS editor shortcut keys to (Emacs/
@ -4278,6 +4280,7 @@ v0.33.19 26-Oct-2001
The users exitinfo file is now stored in his homedirectory The users exitinfo file is now stored in his homedirectory
with mode 0600. with mode 0600.
A lot of code rewrites to make it more modular. A lot of code rewrites to make it more modular.
The bbs datafiles that users create now have mode 0660.
mbnewusr: mbnewusr:
New program, run by user bbs. This is only to register a new New program, run by user bbs. This is only to register a new
@ -4304,5 +4307,7 @@ 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.
Fixed the problem that the KillSent flag was set on processed
netmail.

15
lib/msgflags.c
View File

@ -124,19 +124,20 @@ char *strip_flags(char *flags)
int flag_on(char *flag, char *flags) int flag_on(char *flag, char *flags)
{ {
char *p,*tok; char *p, *tok;
int up=0; int up = FALSE;
Syslog('m', "checking flag \"%s\" in string \"%s\"",MBSE_SS(flag),MBSE_SS(flags));
if (flags == NULL) if (flags == NULL)
return 0; return FALSE;
p=xstrcpy(flags);
Syslog('m', "checking flag \"%s\" in string \"%s\"", MBSE_SS(flag), MBSE_SS(flags));
p = xstrcpy(flags);
for (tok = strtok(p, ", \t\n"); tok; tok = strtok(NULL, ", \t\n")) { for (tok = strtok(p, ", \t\n"); tok; tok = strtok(NULL, ", \t\n")) {
if (strcasecmp(flag, tok) == 0) if (strcasecmp(flag, tok) == 0)
up = 1; up = TRUE;
} }
free(p); free(p);
Syslog('m', "flag%s present",up?"":" not"); Syslog('m', "flag%s present", up ? "":" not");
return up; return up;
} }

7
mbfido/mkftnhdr.c
View File

@ -1,8 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbmail/mkftnhdr.c * $Id$
* Purpose ...............: MBSE BBS Mail Gate * Purpose ...............: MBSE BBS Mail Gate
* Last modification date : 14-Aug-2001
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2001 * Copyright (C) 1997-2001
@ -513,10 +512,8 @@ ftnmsg *mkftnhdr(rfcmsg *msg, int incode, int outcode, int newsmode, faddr *reci
tmsg->flags |= M_RRQ; tmsg->flags |= M_RRQ;
if (hdr((char *)"Notice-Requested-Upon-Delivery-To",msg)) if (hdr((char *)"Notice-Requested-Upon-Delivery-To",msg))
tmsg->flags |= M_RRQ; tmsg->flags |= M_RRQ;
if (!newsmode) { if (!newsmode)
tmsg->flags |= M_PVT; tmsg->flags |= M_PVT;
tmsg->flags |= M_KILLSENT;
}
if ((p = hdr((char *)"X-Origin-Date",msg))) if ((p = hdr((char *)"X-Origin-Date",msg)))
tmsg->date = parsedate(p, NULL); tmsg->date = parsedate(p, NULL);

4
mbfido/sendmail.c
View File

@ -1,8 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: tosser/sendmail.c * $Id$
* Purpose ...............: Output a netmail to one of our links. * Purpose ...............: Output a netmail to one of our links.
* Last modification date : 11-Mar-2001
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2001 * Copyright (C) 1997-2001
@ -81,7 +80,6 @@ FILE *SendMgrMail(faddr *t, int Keep, int FileAttach, char *bymgr, char *subj, c
Now = time(NULL) - (gmt_offset((time_t)0) * 60); Now = time(NULL) - (gmt_offset((time_t)0) * 60);
flags |= (nodes.Crash) ? M_CRASH : 0; flags |= (nodes.Crash) ? M_CRASH : 0;
flags |= (FileAttach) ? M_FILE : 0; flags |= (FileAttach) ? M_FILE : 0;
flags |= (!Keep) ? M_KILLSENT : 0;
flags |= (nodes.Hold) ? M_HOLD : 0; flags |= (nodes.Hold) ? M_HOLD : 0;
/* /*