* bounce messages need subjects

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7d417c34f093506b65a101b5c1b713e28fb2cd46..3c075a6498beaf2fdf2d20d15a0eff90808577d6 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -6764,3 +6764,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index f6557420f12e2f8d818f6df539642824fca2611f..8419df9d09698359c037e25cc0129e04b8a03955 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -1248,9 +1248,13 @@ void network_bounce(struct CtdlMessage *msg, char *reason) {
                free(msg->cm_fields['N']);
        }
 
+       if (msg->cm_fields['U'] == NULL) {
+               free(msg->cm_fields['U']);
+       }
+
        msg->cm_fields['A'] = strdup(BOUNCESOURCE);
        msg->cm_fields['N'] = strdup(config.c_nodename);
-       
+       msg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
 
        /* prepend our node to the path */
        if (msg->cm_fields['P'] != NULL) {

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 77043a91323d90eaad44cf62ab643f5fcb9cff32..770a254c55058743b523e20a2ca5509ffe7d9c60 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -1213,6 +1213,7 @@ void smtp_do_bounce(char *instr) {
         bmsg->cm_fields['A'] = strdup("Citadel");
         bmsg->cm_fields['O'] = strdup(MAILROOM);
         bmsg->cm_fields['N'] = strdup(config.c_nodename);
+        bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
 
        if (give_up) bmsg->cm_fields['M'] = strdup(
 "A message you sent could not be delivered to some or all of its recipients\n"