Mercurial > masqmail
changeset 22:7c1635972aa7
small cleanups
| author | meillo@marmaro.de |
|---|---|
| date | Fri, 05 Dec 2008 11:26:24 +0100 (2008-12-05) |
| parents | 4f4a57f9e8c1 |
| children | 4a3bc3a7afbe |
| files | src/accept.c |
| diffstat | 1 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/accept.c Thu Dec 04 09:45:12 2008 +0100 +++ b/src/accept.c Fri Dec 05 11:26:24 2008 +0100 @@ -128,8 +128,7 @@ if (line1[0] == ' ' || line1[0] == '\t') { /* continuation of 'folded' header: */ if (hdr) { - hdr->header = - g_strconcat(hdr->header, line1, NULL); + hdr->header = g_strconcat(hdr->header, line1, NULL); } } else if (line1[0] == '\n') { @@ -196,14 +195,11 @@ } /* set return path if local */ - if (msg->return_path == NULL) { - - if (msg->received_host == NULL) { - gchar *path = g_strdup_printf("<%s@%s>", passwd->pw_name, conf.host_name); - DEBUG(3) debugf("setting return_path for local accept: %s\n", path); - msg->return_path = create_address(path, TRUE); - g_free(path); - } + if (msg->return_path == NULL && msg->received_host == NULL) { + gchar *path = g_strdup_printf("<%s@%s>", passwd->pw_name, conf.host_name); + DEBUG(3) debugf("setting return_path for local accept: %s\n", path); + msg->return_path = create_address(path, TRUE); + g_free(path); } /* -t option */ @@ -262,7 +258,8 @@ case HEAD_ENVELOPE_TO: if (flags & ACC_SAVE_ENVELOPE_TO) { DEBUG(3) debugf("creating 'X-Orig-Envelope-To' header\n"); - msg->hdr_list = g_list_prepend(msg->hdr_list, create_header(HEAD_UNKNOWN, "X-Orig-Envelope-to: %s", hdr->value)); + msg->hdr_list = g_list_prepend(msg->hdr_list, create_header(HEAD_UNKNOWN, + "X-Orig-Envelope-to: %s", hdr->value)); } DEBUG(3) debugf("removing 'Envelope-To' header\n"); msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);