more places to fix the new linebreak behaviour of the base64 encoder.

[citadel.git] / citadel / modules / dspam / serv_dspam.c

diff --git a/citadel/modules/dspam/serv_dspam.c b/citadel/modules/dspam/serv_dspam.c
index b29ba20a1c73437b861493647e0e2a669e2ffa83..7454634f780cd040d428ae9e9543fa9da0d41aa7 100644 (file)
--- a/citadel/modules/dspam/serv_dspam.c
+++ b/citadel/modules/dspam/serv_dspam.c
@@ -2,21 +2,21 @@
  * This module glues libDSpam to the Citadel server in order to implement
  * DSPAM Spamchecking 
  *
- * Copyright (c) 2009 by the citadel.org team
+ * Copyright (c) 2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  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.
+ *  
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -167,9 +167,13 @@ void dspam_do_msg(long msgnum, void *userdata)
        else
        {
 /* Copy to a safe place */
+               // TODO: len -> cm_fields?
+               msg->cm_fields[eErrorMsg] = malloc (CTX->signature->length * 2);
+               size_t len = CtdlEncodeBase64(msg->cm_fields[eErrorMsg], CTX->signature->data, CTX->signature->length, 0);
 
-               msg->cm_fields['G'] = malloc (CTX->signature->length * 2);
-               CtdlEncodeBase64(msg->cm_fields['G'], CTX->signature->data, CTX->signature->length, 0);
+               if (msg->cm_fields[eErrorMsg][len - 1] == '\n') {
+                       msg->cm_fields[eErrorMsg][len - 1] = '\0';
+               }
        }
        free(msgtext);
 
@@ -258,7 +262,7 @@ CTDL_MODULE_INIT(dspam)
 #endif /* HAVE_LIBDSPAM */
        }
        
-        /* return our Subversion id for the Log */
+        /* return our module name for the log */
        return "dspam";
 }