diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2020-10-07 12:07:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 12:07:09 -0300 |
| commit | bd407b54d26981f30a95bc316ea2ed965d070c53 (patch) | |
| tree | 6f09c1a81a5e54dd214878ad52a8f0e0e318982b /ospf6d/ospf6_main.c | |
| parent | 9cfb2747adc875a7aaa7f99a45a65f65234a2004 (diff) | |
| parent | 7df1f3623ec3fb47be4f3b8234c393067c69ab4d (diff) | |
Merge pull request #7058 from Niral-Networks/niral_dev_vrf_ospf6
ospf6d : Socket change for ospf6d vrf support.
Diffstat (limited to 'ospf6d/ospf6_main.c')
| -rw-r--r-- | ospf6d/ospf6_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 182faf0038..8533c1b12c 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -55,7 +55,7 @@ #define OSPF6_VTY_PORT 2606 /* ospf6d privileges */ -zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND}; +zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN}; struct zebra_privs_t ospf6d_privs = { #if defined(FRR_USER) @@ -68,7 +68,7 @@ struct zebra_privs_t ospf6d_privs = { .vty_group = VTY_GROUP, #endif .caps_p = _caps_p, - .cap_num_p = 2, + .cap_num_p = array_size(_caps_p), .cap_num_i = 0}; /* ospf6d options, we use GNU getopt library. */ @@ -86,6 +86,7 @@ static void __attribute__((noreturn)) ospf6_exit(int status) if (ospf6) { vrf = vrf_lookup_by_id(ospf6->vrf_id); + ospf6_serv_close(&ospf6->fd); ospf6_delete(ospf6); ospf6 = NULL; } else @@ -101,7 +102,6 @@ static void __attribute__((noreturn)) ospf6_exit(int status) ospf6_asbr_terminate(); ospf6_lsa_terminate(); - ospf6_serv_close(); /* reverse access_list_init */ access_list_reset(); |