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

Experimental patch for ftn2rfc gate

Browse Source
This commit is contained in:
Michiel Broek 2002-02-07 21:09:24 +00:00
parent bd8e5e2527
commit 568008a5e3
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4507,6 +4507,8 @@ v0.33.19 26-Oct-2001
Now limits fetching of newsheaders according to area setting. Now limits fetching of newsheaders according to area setting.
Added the Size parameter to the tic files, this appeared to Added the Size parameter to the tic files, this appeared to
be missing since a while. be missing since a while.
Fixes for Fido->internet gate for dropped characters during
linewrap. Experimental.
mbfile: mbfile:
During check the file databases are reset to filemode 0660. During check the file databases are reset to filemode 0660.

19
mbfido/ftn2rfc.c
View File

@ -581,7 +581,7 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
newsmode = TRUE; newsmode = TRUE;
} else } else
newsmode = FALSE; newsmode = FALSE;
Syslog('M', "Got %s message", newsmode?"echo":"netmail"); Syslog('m', "Got %s message", newsmode?"echo":"netmail");
if ((outcode == CHRS_NOTSET) && (hdr((char *)"MSGID", kmsg))) { if ((outcode == CHRS_NOTSET) && (hdr((char *)"MSGID", kmsg))) {
p = rfcmsgid(hdr((char *)"MSGID",kmsg),bestaka); p = rfcmsgid(hdr((char *)"MSGID",kmsg),bestaka);
@ -905,14 +905,17 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
* Probaly not needed as messages for systems without ISP never get here. * Probaly not needed as messages for systems without ISP never get here.
* Perhaps only news to moderators. * Perhaps only news to moderators.
*/ */
Syslog('m', "We should not be here");
sprintf(temp, "From %s!%s %s", ascinode(f,0x3f), ascinode(f,0x40), ctime(&mdate)); sprintf(temp, "From %s!%s %s", ascinode(f,0x3f), ascinode(f,0x40), ctime(&mdate));
Send(FALSE, temp); Send(FALSE, temp);
} }
Syslog('m', "Should send Received: header for mbfido");
sprintf(temp, "Received: from %s by %s\n", ascinode(f,0x3f), ascinode(bestaka,0x3f)); sprintf(temp, "Received: from %s by %s\n", ascinode(f,0x3f), ascinode(bestaka,0x3f));
Send(FALSE, temp); Send(FALSE, temp);
sprintf(temp, "\twith FTN (mbfido v.%s) id AA%u; %s\n", VERSION, getpid(), rfcdate(now)); sprintf(temp, "\twith FTN (mbfido v.%s) id AA%u; %s\n", VERSION, getpid(), rfcdate(now));
Send(FALSE, temp); Send(FALSE, temp);
Syslog('m', "Is done now");
for (qmsg = kmsg; qmsg; qmsg = qmsg->next) for (qmsg = kmsg; qmsg; qmsg = qmsg->next)
if (!strcasecmp(qmsg->key,"RFC-Received")) { if (!strcasecmp(qmsg->key,"RFC-Received")) {
@ -1539,7 +1542,7 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
count = lines = 0; count = lines = 0;
first = TRUE; first = TRUE;
Syslog('M', "Start sending message body"); Syslog('m', "Start sending message body");
while (fgets(buf,sizeof(buf)-1,fp) && pass) { while (fgets(buf,sizeof(buf)-1,fp) && pass) {
if (first) { if (first) {
p = xstrcpy((char *)"\n"); p = xstrcpy((char *)"\n");
@ -1558,7 +1561,7 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
} }
if (ftell(fp) > endmsg_off) { if (ftell(fp) > endmsg_off) {
Syslog('M', "line \"%s\" past message end %ld %ld", buf,(long)endmsg_off, ftell(fp)); Syslog('m', "line \"%s\" past message end %ld %ld", buf,(long)endmsg_off, ftell(fp));
pass=0; pass=0;
} }
if (pass) { if (pass) {
@ -1571,9 +1574,11 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
} }
if ((count++ > BOUNDARY) && (!pgpsigned)) { if ((count++ > BOUNDARY) && (!pgpsigned)) {
if (b) { if (b) {
*b++='\r'; // *b++='\r';
*b = '\n'; // *b = '\n';
p=b+2; *b++='\n'; // Replace space.
p = b + 1;
// p=b+2;
b=NULL; b=NULL;
lines++; lines++;
count=0; count=0;
@ -1588,7 +1593,7 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
free(q); free(q);
} }
} }
Syslog('M', "End sending message body"); Syslog('m', "End sending message body");
if ((modtype==1) && (!hdr((char *)"Approved",msg)) && if ((modtype==1) && (!hdr((char *)"Approved",msg)) &&
(!hdr((char *)"RFC-Approved",kmsg)) && (!hdr((char *)"Approved",kmsg))) (!hdr((char *)"RFC-Approved",kmsg)) && (!hdr((char *)"Approved",kmsg)))