diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2020-07-19 11:36:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 11:36:38 +0200 |
| commit | 67ce4ba19b00eaa542d12c17c5da0652238a8049 (patch) | |
| tree | c8ccad29f06f89b6bfd4bde564f7704b0aeec6c6 | |
| parent | 3ab3b0f2118c58058e9ed4936ea9979a83105ff2 (diff) | |
| parent | d76c38ade314bcdc58c2ff69f3b9c80ddf2293d2 (diff) | |
Merge pull request #6767 from donaldsharp/compile_issues
| -rw-r--r-- | pimd/pim_cmd.c | 8 | ||||
| -rw-r--r-- | zebra/zebra_netns_notify.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 6ede015a0e..db3f0b8b23 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -6784,12 +6784,13 @@ static int pim_rp_cmd_worker(struct pim_instance *pim, struct vty *vty, if (result == PIM_GROUP_BAD_ADDR_MASK_COMBO) { vty_out(vty, "%% Inconsistent address and mask: %s\n", - group); + group ? group : "No Group Address"); return CMD_WARNING_CONFIG_FAILED; } if (result == PIM_GROUP_BAD_ADDRESS) { - vty_out(vty, "%% Bad group address specified: %s\n", group); + vty_out(vty, "%% Bad group address specified: %s\n", + group ? group : "No Group Address"); return CMD_WARNING_CONFIG_FAILED; } @@ -7158,7 +7159,8 @@ static int pim_no_rp_cmd_worker(struct pim_instance *pim, struct vty *vty, int result = pim_rp_del_config(pim, rp, group, plist); if (result == PIM_GROUP_BAD_ADDRESS) { - vty_out(vty, "%% Bad group address specified: %s\n", group); + vty_out(vty, "%% Bad group address specified: %s\n", + group ? group : "No Group Address"); return CMD_WARNING_CONFIG_FAILED; } diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index 4e504c48b0..995fa6fb5a 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -185,7 +185,7 @@ static bool zebra_ns_notify_is_default_netns(const char *name) { struct stat default_netns_stat; struct stat st; - char netnspath[64]; + char netnspath[PATH_MAX]; if (zebra_ns_notify_self_identify(&default_netns_stat)) return false; |