[Dbmail-dev] Patch against svn-2023: bandaid for CHARSET searches

[Matthew Sayler]

Hello,

My squirrelmail instance seems to issue the following command when doing
SEARCH's of a mailbox for a given string (in this case "foo"):

A008 UID SEARCH CHARSET ISO-8859-1 ALL FROM {3}
foo

the "CHARSET ISO-8859-1" bit confused dbmail -- and the search turns
into a search all..  not very conveniant.

Attached is a patch against SVN-2023 that applies the same fix as in
SORT, namely ignore the charset bits.  With this patch, Squirrelmail
searches perform properly for me.

If someone applies this to svn, could you please ping me or the list?

Matt


Index: dbmail-mailbox.c
===================================================================
--- dbmail-mailbox.c    (revision 2023)
+++ dbmail-mailbox.c    (working copy)
@@ -912,7 +912,18 @@
                value->type = IST_SET;
                strncpy(value->search, search_keys[*idx], MAX_SEARCH_LEN);
                (*idx)++;
+       } else if ( MATCH(key, "utf-8") ) {
+               (*idx)++;
 
+       } else if ( MATCH(key, "us-ascii") )  {
+               (*idx)++;
+
+       } else if ( MATCH(key, "charset") )  {
+               (*idx)++;
+
+       } else if ( MATCH(key, "iso-8859-1") )  {
+               (*idx)++;
+
        } else {
                /* unknown search key */
                g_free(value);