Skip to content

Commit 48c41bb

Browse files
committed
move sasl config setup to router initialization
1 parent 08172a7 commit 48c41bb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/server.c

+9-3
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,9 @@ static void on_connection_bound(qd_server_t *server, pn_event_t *e) {
746746
//
747747
//sys_mutex_lock(&ctx->server->lock);
748748
pn_sasl_t *sasl = pn_sasl(tport);
749-
if (ctx->server->sasl_config_path)
750-
pn_sasl_config_path(sasl, ctx->server->sasl_config_path);
751-
pn_sasl_config_name(sasl, ctx->server->sasl_config_name);
749+
//if (ctx->server->sasl_config_path)
750+
// pn_sasl_config_path(sasl, ctx->server->sasl_config_path);
751+
// pn_sasl_config_name(sasl, ctx->server->sasl_config_name);
752752
if (config->sasl_mechanisms)
753753
pn_sasl_allowed_mechs(sasl, config->sasl_mechanisms);
754754
pn_transport_require_auth(tport, config->requireAuthentication);
@@ -1427,6 +1427,12 @@ qd_server_t *qd_server(qd_dispatch_t *qd, int thread_count, const char *containe
14271427
qd_server->next_connection_id = 1;
14281428
qd_server->py_displayname_obj = 0;
14291429

1430+
1431+
if (qd_server->sasl_config_path)
1432+
pn_sasl_config_path(0, qd_server->sasl_config_path);
1433+
if (qd_server->sasl_config_name)
1434+
pn_sasl_config_name(0, qd_server->sasl_config_name);
1435+
14301436
qd_server->http = qd_http_server(qd_server);
14311437

14321438
qd_log(LOG_SERVER, QD_LOG_INFO, "Container Name: %s", qd_server->container_name);

0 commit comments

Comments
 (0)