o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

various cleanup

Browse source
This commit is contained in:
rsc 2006-02-11 23:38:55 +00:00
parent e4d832222b
commit b5f65921f3
37 changed files with 223 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cmd/upas/smtp/smtpd.c
View file

@ -157,7 +157,7 @@ main(int argc, char **argv)
if(debug){
close(2);
snprint(buf, sizeof(buf), "%s/smtpd", UPASLOG);
snprint(buf, sizeof(buf), "%s/smtpd.db", UPASLOG);
if (open(buf, OWRITE) >= 0) {
seek(2, 0, 2);
fprint(2, "%d smtpd %s\n", getpid(), thedate());
@ -1221,6 +1221,16 @@ data(void)
}
reply("%d mail process terminated abnormally\r\n", code);
} else {
/*
* if a message appeared on stderr, despite good status,
* log it. this can happen if rewrite.in contains a bad
* r.e., for example.
*/
if(*s_to_c(err))
syslog(0, "smtpd",
"%s returned good status, but said: %s",
s_to_c(mailer), s_to_c(err));
if(filterstate == BLOCKED)
reply("554 we believe this is spam. we don't accept it.\r\n");
else