zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospfd / ospf_zebra.c

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 4de68b15f2a14cd80be5642f9721f7bbb6c34084..c7bde55cd9d12c10ebd0e87a8586ec5c916cb386 100644 (file)
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -583,7 +583,7 @@ void ospf_external_del(struct ospf *ospf, uint8_t type, unsigned short instance)
                listnode_delete(ospf->external[type], ext);
 
                if (!ospf->external[type]->count)
-                       list_delete_and_null(&ospf->external[type]);
+                       list_delete(&ospf->external[type]);
 
                XFREE(MTYPE_OSPF_EXTERNAL, ext);
        }
@@ -643,7 +643,7 @@ void ospf_redist_del(struct ospf *ospf, uint8_t type, unsigned short instance)
        if (red) {
                listnode_delete(ospf->redist[type], red);
                if (!ospf->redist[type]->count) {
-                       list_delete_and_null(&ospf->redist[type]);
+                       list_delete(&ospf->redist[type]);
                }
                ospf_routemap_unset(red);
                XFREE(MTYPE_OSPF_REDISTRIBUTE, red);
@@ -1577,7 +1577,7 @@ static void ospf_zebra_connected(struct zclient *zclient)
 void ospf_zebra_init(struct thread_master *master, unsigned short instance)
 {
        /* Allocate zebra structure. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_OSPF, instance, &ospfd_privs);
        zclient->zebra_connected = ospf_zebra_connected;
        zclient->router_id_update = ospf_router_id_update_zebra;