From 1526b8d6afc5afa3661e24f5c0e9ff9e6b4c96d8 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 1 Apr 2011 11:35:48 -0400 Subject: [PATCH] Temporarily adding dump of badmail to smtpclient --- citadel/modules/smtp/serv_smtpclient.c | 10 +++++++++- citadel/room_ops.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c index d4ca65264..8b84b12dd 100644 --- a/citadel/modules/smtp/serv_smtpclient.c +++ b/citadel/modules/smtp/serv_smtpclient.c @@ -183,7 +183,15 @@ void smtp_try(const char *key, const char *addr, int *status, scan_done = 1; } } while (scan_done == 0); - if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org"); + if (IsEmptyStr(mailfrom)) { + char badmail_filename[128]; + snprintf(badmail_filename, sizeof badmail_filename, "/tmp/badmail.%d.%ld", + getpid, time(NULL) + ); + FILE *badmail_fp = fopen(badmail_filename, "w"); + fwrite(msgtext, msg_size, 1, badmail_fp); + fclose(badmail_fp); + } stripallbut(mailfrom, '<', '>'); envelope_from = mailfrom; } diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 629aeeb30..30b14ae3c 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -143,7 +143,7 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, /* For mailbox rooms, also check the namespace */ /* Also, mailbox owners can delete their messages */ - if (roombuf->QRflags & QR_MAILBOX) { + if ( (roombuf->QRflags & QR_MAILBOX) && (atol(roombuf->QRname) != 0)) { if (userbuf->usernum == atol(roombuf->QRname)) { retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED; } -- 2.30.2