Remove the 'Organization:' field from RFC822 output.

It isn't a defined field.  (Seems to be borrowed from usenet.)

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 34985c4af0ba03f025083ad1d40fb103b5850212..111e0d8f338a6b4376bc7fd3de3ea35c46d6beef 100644 (file)
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -1009,6 +1009,7 @@ void ical_conflicts_phase5(struct icaltimetype t1start,
                }
 
        } while ( (rrule) && (!icaltime_is_null_time(t2start)) && (num_recur < MAX_RECUR) );
+       icalrecur_iterator_free(ritr);
        if (num_recur > 0) CtdlLogPrintf(CTDL_DEBUG, "Iterated over existing event %d times.\n", num_recur);
 }
 
@@ -1078,6 +1079,7 @@ void ical_conflicts_phase4(icalcomponent *proposed_event,
                }
 
        } while ( (rrule) && (!icaltime_is_null_time(t1start)) && (num_recur < MAX_RECUR) );
+       icalrecur_iterator_free(ritr);
        if (num_recur > 0) CtdlLogPrintf(CTDL_DEBUG, "Iterated over proposed event %d times.\n", num_recur);
 }
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1401175565d5525ef0ef1b5ff3ef29a1f4a4319c..1d691ebb8f4c950797914158f5390583ad429676 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1623,7 +1623,6 @@ int CtdlOutputPreLoadedMsg(
        char luser[100];
        char fuser[100];
        char snode[100];
-       char lnode[100];
        char mid[100];
        char datestamp[100];
 
@@ -1783,7 +1782,6 @@ int CtdlOutputPreLoadedMsg(
        strcpy(luser, "");
        strcpy(fuser, "");
        strcpy(snode, NODENAME);
-       strcpy(lnode, HUMANNODE);
        if (mode == MT_RFC822) {
                for (i = 0; i < 256; ++i) {
                        if (TheMessage->cm_fields[i]) {
@@ -1815,8 +1813,6 @@ int CtdlOutputPreLoadedMsg(
                                }
                                else if (i == 'I')
                                        safestrncpy(mid, mptr, sizeof mid);
-                               else if (i == 'H')
-                                       safestrncpy(lnode, mptr, sizeof lnode);
                                else if (i == 'F')
                                        safestrncpy(fuser, mptr, sizeof fuser);
                                /* else if (i == 'O')
@@ -1895,8 +1891,6 @@ int CtdlOutputPreLoadedMsg(
                        cprintf("From: \"%s\" <%s@%s>%s", luser, suser, snode, nl);
                }
 
-               cprintf("Organization: %s%s", lnode, nl);
-
                /* Blank line signifying RFC822 end-of-headers */
                if (TheMessage->cm_format_type != FMT_RFC822) {
                        cprintf("%s", nl);