From 32412be33898d9bf9416c4b675d424397638ef39 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 31 Oct 2008 02:00:38 +0000 Subject: [PATCH] Remove the 'Organization:' field from RFC822 output. It isn't a defined field. (Seems to be borrowed from usenet.) --- citadel/modules/calendar/serv_calendar.c | 2 ++ citadel/msgbase.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index 34985c4af..111e0d8f3 100644 --- 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 140117556..1d691ebb8 100644 --- 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); -- 2.30.2