Fixed posting local email to SMTP server

This commit is contained in:
Michiel Broek 2002-11-02 14:51:19 +00:00
parent bab69f2208
commit 5667926eab
3 changed files with 186 additions and 153 deletions

View File

@ -19,6 +19,9 @@ v0.35.05 19-Oct-2002
Changed the section about ftp feeds. Changed the section about ftp feeds.
Added Q&A about failing internet polls. Added Q&A about failing internet polls.
mbsebbs:
Email posted at the bbs was not signed with the signature.
mbcico: mbcico:
Fixed crash with incoming YooHoo session with bad password. Fixed crash with incoming YooHoo session with bad password.
Still used the phone override fields for hostname override Still used the phone override fields for hostname override
@ -54,6 +57,8 @@ v0.35.05 19-Oct-2002
Echomail is now also packed or not according to the packmail Echomail is now also packed or not according to the packmail
switch in mbsetup. switch in mbsetup.
Statistics count for exported echomail now works. Statistics count for exported echomail now works.
Email posted in the email box in full domain mode was refused
by SMTP servers because of bad address formatting.
mbtask: mbtask:
Removed debug logging of "does" info. Removed debug logging of "does" info.

View File

@ -1111,9 +1111,8 @@ void ExportEmail(unsigned long MsgNum)
{ {
char *p; char *p;
FILE *qp; FILE *qp;
int retval, flags = 0; int retval, flags = 0, kludges = TRUE;
faddr *from, *too; faddr *from, *too;
int kludges = TRUE;
Syslog('m', "Export email to %s", Msg.To); Syslog('m', "Export email to %s", Msg.To);
Syslog('m', " from %s", Msg.From); Syslog('m', " from %s", Msg.From);
@ -1171,7 +1170,25 @@ void ExportEmail(unsigned long MsgNum)
if (CFG.EmailMode != E_NOISP) { if (CFG.EmailMode != E_NOISP) {
/* /*
* Dialup or direct internet connection, send message via MTA. * Dialup or direct internet connection, send message via MTA.
* First check if the From and To addresses contain spaces, if
* so everything after the space is removed.
*/ */
p = Msg.From;
while (*p) {
if (*p == ' ') {
*p = '\0';
break;
}
p++;
}
p = Msg.To;
while (*p) {
if (*p == ' ') {
*p = '\0';
break;
}
p++;
}
retval = postemail(qp, Msg.From, Msg.To); retval = postemail(qp, Msg.From, Msg.To);
} else { } else {
/* /*

View File

@ -297,12 +297,8 @@ int Save_Email(int IsReply)
sprintf(p, "<%08lx@%s>", id, CFG.sysdomain); sprintf(p, "<%08lx@%s>", id, CFG.sysdomain);
sprintf(temp, "\001Message-id: %s", p); sprintf(temp, "\001Message-id: %s", p);
MsgText_Add2(temp); MsgText_Add2(temp);
// sprintf(temp, "\001MSGID: %s %08lx", aka2str(CFG.EmailFidoAka), id);
// MsgText_Add2(temp);
Msg.MsgIdCRC = upd_crc32(temp, crc, strlen(temp)); Msg.MsgIdCRC = upd_crc32(temp, crc, strlen(temp));
free(p); free(p);
// sprintf(temp, "\001PID: MBSE-BBS %s", VERSION);
// MsgText_Add2(temp);
if (IsReply) { if (IsReply) {
sprintf(temp, "\001In-reply-to: %s", Msg.Replyid); sprintf(temp, "\001In-reply-to: %s", Msg.Replyid);
@ -318,6 +314,21 @@ int Save_Email(int IsReply)
for (i = 1; i < Line; i++) { for (i = 1; i < Line; i++) {
MsgText_Add2(Message[i]); MsgText_Add2(Message[i]);
} }
/*
* Add signature.
*/
sprintf(temp, "%s/%s/.signature", CFG.bbs_usersdir, exitinfo.Name);
if ((fp = fopen(temp, "r"))) {
Syslog('m', " Add .signature");
MsgText_Add2((char *)"");
while (fgets(temp, 80, fp)) {
Striplf(temp);
MsgText_Add2(temp);
}
fclose(fp);
MsgText_Add2((char *)"");
}
MsgText_Add2(TearLine()); MsgText_Add2(TearLine());
/* /*