fts-backend-solr-old.c (dovecot-2.3.16) | : | fts-backend-solr-old.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 256 | skipping to change at line 256 | |||
struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend; | struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend; | |||
struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_backend->ns->user); | struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_backend->ns->user); | |||
struct ssl_iostream_settings ssl_set; | struct ssl_iostream_settings ssl_set; | |||
const char *str; | const char *str; | |||
if (fuser == NULL) { | if (fuser == NULL) { | |||
*error_r = "Invalid fts_solr setting"; | *error_r = "Invalid fts_solr setting"; | |||
return -1; | return -1; | |||
} | } | |||
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); | |||
if (solr_connection_init(&fuser->set, &ssl_set, | if (solr_connection_init(&fuser->set, &ssl_set, | |||
_backend->ns->user->event, | _backend->ns->user->event, | |||
&backend->solr_conn, error_r) < 0) | &backend->solr_conn, error_r) < 0) | |||
return -1; | return -1; | |||
str = solr_escape_id_str(_backend->ns->user->username); | str = solr_escape_id_str(_backend->ns->user->username); | |||
backend->id_username = i_strdup(str); | backend->id_username = i_strdup(str); | |||
return 0; | return 0; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 0 lines changed or added |