+++ /dev/null
-Description: Fix a const cast in the header
-Author: Don Armstrong <don@donarmstrong.com>
-Forwarded: no
-Index: spamass-milter/spamass-milter.cpp
-===================================================================
---- spamass-milter.orig/spamass-milter.cpp 2012-06-21 13:02:08.000000000 -0700
-+++ spamass-milter/spamass-milter.cpp 2012-06-21 13:02:15.000000000 -0700
-@@ -363,7 +363,7 @@
- // }}}
-
- /* Update a header if SA changes it, or add it if it is new. */
--void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, char *header )
-+void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, const char *header )
- {
- string::size_type eoh1 = assassin->d().find("\n\n");
- string::size_type eoh2 = assassin->d().find("\n\r\n");
-@@ -386,15 +386,16 @@
- {
- /* change if old one was present, append if non-null */
- char* cstr = const_cast<char*>(newstring.c_str());
-+ char* hstr = const_cast<char*>(header);
- if (oldsize > 0)
- {
- debug(D_UORI, "u_or_i: changing");
-- smfi_chgheader(ctx, header, 1, newstring.size() > 0 ?
-+ smfi_chgheader(ctx, hstr, 1, newstring.size() > 0 ?
- cstr : NULL );
- } else if (newstring.size() > 0)
- {
- debug(D_UORI, "u_or_i: inserting");
-- smfi_addheader(ctx, header, cstr);
-+ smfi_addheader(ctx, hstr, cstr);
- }
- } else
- {