From 7299f082a016551fd798e54dc44ed250ed3ac210 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 20 Mar 2000 14:43:20 +0000 Subject: [PATCH] * "Brown paper bag" fix for SMTP bug (incoming long fields crash logger) --- citadel/ChangeLog | 4 +++- citadel/internet_addressing.c | 13 ------------- citadel/network/mail.sysinfo | 8 ++++---- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 78ba3f8d8..f80f95c8e 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 570.1 2000/03/20 14:43:19 ajc + * "Brown paper bag" fix for SMTP bug (incoming long fields crash logger) + Revision 570.0 2000/03/19 23:42:34 ajc * This is the official 5.70 release. @@ -1768,4 +1771,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index a6c7eabe9..3ec2d6a6c 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -287,8 +287,6 @@ void try_name(struct usersupp *us, void *data) { struct trynamebuf *tnb; tnb = (struct trynamebuf *)data; - lprintf(9, "Trying <%s>\n", us->fullname); - if (!strncasecmp(tnb->buffer1, "cit", 3)) if (atol(&tnb->buffer1[3]) == us->usernum) strcpy(tnb->buffer2, us->fullname); @@ -422,8 +420,6 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { value = &key[(colonpos - beg) + 1]; unfold_rfc822_field(value); - lprintf(9, "Key=<%s> Value=<%s>\n", key, value); - /* * Here's the big rfc822-to-citadel loop. */ @@ -434,8 +430,6 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { if (!strcasecmp(key, "Date")) { parsed_date = parsedate(value); if (parsed_date < 0L) parsed_date = time(NULL); - lprintf(9, "Parsed date is %s", - asctime(localtime(&parsed_date))); snprintf(buf, sizeof buf, "%ld", parsed_date ); if (msg->cm_fields['T'] == NULL) msg->cm_fields['T'] = strdoop(buf); @@ -484,10 +478,6 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { } } - if (msg->cm_fields['I'] != NULL) { - lprintf(9, "Converted message id <%s>\n", - msg->cm_fields['I'] ); - } processed = 1; } @@ -523,7 +513,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { while (!done) { - TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']); /* Locate beginning and end of field, keeping in mind that * some fields might be multiline */ @@ -557,7 +546,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { } /* Follow-up sanity checks... */ - TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']); /* If there's no timestamp on this message, set it to now. */ if (msg->cm_fields['T'] == NULL) { @@ -565,7 +553,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { msg->cm_fields['T'] = strdoop(buf); } - TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']); lprintf(9, "RFC822 length remaining after conversion = %d\n", strlen(rfc822)); return msg; diff --git a/citadel/network/mail.sysinfo b/citadel/network/mail.sysinfo index 5437c78ae..5237971b8 100644 --- a/citadel/network/mail.sysinfo +++ b/citadel/network/mail.sysinfo @@ -10,12 +10,12 @@ use uncnsrd phonenum netproc[7145]: Adding non-neighbor system to map gdom or system to map humannode BCCS -lastcontact 953246224 Thu Mar 16 17:37:04 2000 +lastcontact 953519823 Sun Mar 19 21:37:03 2000 internet uum %s humannode Internet Gateway -lastcontact 953440623 Sat Mar 18 23:37:03 2000 +lastcontact 953559424 Mon Mar 20 08:37:04 2000 uncnsrd bin Mail @@ -36,14 +36,14 @@ tesseract bin Mail phonenum US 800 555 1212 humannode Tesseract Project -lastcontact 953440623 Sat Mar 18 23:37:03 2000 +lastcontact 953559424 Mon Mar 20 08:37:04 2000 pixel use uncnsrd phonenum netproc[4026]: Adding non-neighbor system to map gdom or system to map humannode PixelBBS -lastcontact 953271423 Fri Mar 17 00:37:03 2000 +lastcontact 953527024 Sun Mar 19 23:37:04 2000 barbaria use uncnsrd -- 2.39.2