fts-backend-solr.c (dovecot-2.3.16) | : | fts-backend-solr.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 196 | skipping to change at line 196 | |||
if (fuser == NULL) { | if (fuser == NULL) { | |||
*error_r = "Invalid fts_solr setting"; | *error_r = "Invalid fts_solr setting"; | |||
return -1; | return -1; | |||
} | } | |||
if (fuser->set.use_libfts) { | if (fuser->set.use_libfts) { | |||
/* change our flags so we get proper input */ | /* change our flags so we get proper input */ | |||
_backend->flags &= ENUM_NEGATE(FTS_BACKEND_FLAG_FUZZY_SEARCH); | _backend->flags &= ENUM_NEGATE(FTS_BACKEND_FLAG_FUZZY_SEARCH); | |||
_backend->flags |= FTS_BACKEND_FLAG_TOKENIZED_INPUT; | _backend->flags |= FTS_BACKEND_FLAG_TOKENIZED_INPUT; | |||
} | } | |||
i_zero(&ssl_set); | ||||
mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set); | mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set); | |||
return solr_connection_init(&fuser->set, &ssl_set, | return solr_connection_init(&fuser->set, &ssl_set, | |||
_backend->ns->user->event, | _backend->ns->user->event, | |||
&backend->solr_conn, error_r); | &backend->solr_conn, error_r); | |||
} | } | |||
static void fts_backend_solr_deinit(struct fts_backend *_backend) | static void fts_backend_solr_deinit(struct fts_backend *_backend) | |||
{ | { | |||
struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend; | struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend; | |||
solr_connection_deinit(&backend->solr_conn); | solr_connection_deinit(&backend->solr_conn); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 0 lines changed or added |