diff options
| -rw-r--r-- | mgmtd/mgmt_txn.c | 9 | ||||
| -rw-r--r-- | zebra/zebra_dplane.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c index 8a9486784e..53457e8969 100644 --- a/mgmtd/mgmt_txn.c +++ b/mgmtd/mgmt_txn.c @@ -614,9 +614,12 @@ static void mgmt_txn_process_set_cfg(struct event *thread) txn_req->req.set_cfg->dst_ds_id, txn->txn_id, txn->session_id, strerror(ret)); - mgmt_txn_send_commit_cfg_reply( - txn, MGMTD_DS_LOCK_FAILED, - "running DS not locked for implicit commit"); + mgmt_fe_send_set_cfg_reply( + txn->session_id, txn->txn_id, + txn_req->req.set_cfg->ds_id, + txn_req->req_id, MGMTD_DS_LOCK_FAILED, + "running DS not locked for implicit commit", + txn_req->req.set_cfg->implicit_commit); goto mgmt_txn_process_set_cfg_done; } diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 2e48c221e3..ba1c4ce584 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -4047,6 +4047,7 @@ static int dplane_ctx_iptable_init(struct zebra_dplane_ctx *ctx, ctx->zd_vrf_id = iptable->vrf_id; memcpy(&ctx->u.iptable, iptable, sizeof(struct zebra_pbr_iptable)); + ctx->u.iptable.interface_name_list = NULL; if (iptable->nb_interface > 0) { ctx->u.iptable.interface_name_list = list_new(); ctx->u.iptable.interface_name_list->del = |