- change sender address of auto forward to forwarder, to prevent confusion caused by incorrect forward settings.

- (internal) change bsmtp to allow assigning from address


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4173 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 3 insertions, 5 deletions

diff --git a/mbbsd/record.c b/mbbsd/record.c
index d6269ce3..0afba2c7 100644
--- a/mbbsd/record.c
+++ b/mbbsd/record.c
@@ -636,11 +636,9 @@ append_record_forward(char *fpath, fileheader_t * record, int size, const char *
 		buf[n + 1] = 0;
 		strcat(buf, record->filename);
 		append_record(fpath, record, size);
-#ifndef  USE_BSMTP
-		bbs_sendmail(buf, record->title, address);
-#else
-		bsmtp(buf, record->title, address);
-#endif
+		// because too many user set wrong forward address,
+		// let's but them instead. 
+		bsmtp(buf, record->title, address, origid);
 		return 0;
 	    }
 	}