if (sdb)
{
yaz_mutex_leave(host->mutex);
- connection_connect(con, iochan_man);
client_start_search(con->client);
}
else
const char *charset;
const char *sru;
const char *sru_version = 0;
+ const char *value;
WRBUF w;
struct session_database *sdb = client_get_database(con->client);
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
+
+ if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
+ ZOOM_options_set(zoptions, "sru", sru);
+ if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
+ && *sru_version)
+ ZOOM_options_set(zoptions, "sru_version", sru_version);
+
if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
{
+ /* allow splitting user and reset with a blank always */
const char *cp1 = strchr(auth, ' ');
+ if (!cp1 && sru && *sru)
+ cp1 = strchr(auth, '/');
if (!cp1)
+ {
+ /* Z39.50 user/password style, or no password for SRU */
ZOOM_options_set(zoptions, "user", auth);
+ }
else
{
+ /* now consider group as well */
const char *cp2 = strchr(cp1 + 1, ' ');
ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
}
}
}
- if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
- ZOOM_options_set(zoptions, "sru", sru);
- if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
- && *sru_version)
- ZOOM_options_set(zoptions, "sru_version", sru_version);
+
+ value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE);
+ if (value && *value)
+ ZOOM_options_set(zoptions, "authenticationMode", value);
+
if (!(con->link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");