dovecot-2.2: fts: Replace '-' with '_' in tokenizer-specific fts...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/cebe8be92034
changeset: 18550:cebe8be92034
user:      Teemu Huovila <teemu.huovila at dovecot.fi>
date:      Sat May 09 11:03:21 2015 +0300
description:
fts: Replace '-' with '_' in tokenizer-specific fts_tokenizers_* settings

diffstat:

 src/plugins/fts/fts-user.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r ae0458c63761 -r cebe8be92034 src/plugins/fts/fts-user.c
--- a/src/plugins/fts/fts-user.c	Sat May 09 11:02:22 2015 +0300
+++ b/src/plugins/fts/fts-user.c	Sat May 09 11:03:21 2015 +0300
@@ -123,7 +123,7 @@
 {
 	const struct fts_tokenizer *tokenizer_class;
 	struct fts_tokenizer *tokenizer = NULL, *parent = NULL;
-	const char *tokenizers_key, *const *tokenizers;
+	const char *tokenizers_key, *const *tokenizers, *tokenizer_set_name;
 	const char *str, *error, *set_key, *const *settings;
 	unsigned int i;
 	int ret = 0;
@@ -144,7 +144,8 @@
 			break;
 		}
 
-		set_key = t_strdup_printf("fts_tokenizers_%s", tokenizers[i]);
+		tokenizer_set_name = t_str_replace(tokenizers[i], '-', '_');
+		set_key = t_strdup_printf("fts_tokenizers_%s", tokenizer_set_name);
 		str = mail_user_plugin_getenv(user, set_key);
 
 		/* If the email-address tokenizer is included in the search