X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;fp=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=30f64baab4098cdc413eac298823968a3fb11501;hb=e64a3711948fd273213f363aa7525188bd5cda68;hp=c948bc619006121225321d21d67f2e15db87e953;hpb=1c7ddd427e20fd24f19087a7f225a1a7e7cb9fad;p=citadel.git diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c index c948bc619..30f64baab 100644 --- a/citadel/modules/sieve/serv_sieve.c +++ b/citadel/modules/sieve/serv_sieve.c @@ -2,7 +2,7 @@ * This module glues libSieve to the Citadel server in order to implement * the Sieve mailbox filtering language (RFC 3028). * - * Copyright (c) 1987-2017 by the citadel.org team + * Copyright (c) 1987-2018 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -578,9 +578,6 @@ void sieve_do_msg(long msgnum, void *userdata) { if (!CM_IsEmpty(msg, erFc822Addr)) { safestrncpy(my.sender, msg->cm_fields[erFc822Addr], sizeof my.sender); } - else if ( (!CM_IsEmpty(msg, eAuthor)) && (!CM_IsEmpty(msg, eNodeName)) ) { - snprintf(my.sender, sizeof my.sender, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]); - } else if (!CM_IsEmpty(msg, eAuthor)) { safestrncpy(my.sender, msg->cm_fields[eAuthor], sizeof my.sender); }