mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-01-05 08:31:53 +00:00
Fixed undefined attribute handling
This commit is contained in:
parent
13ef5e53dd
commit
dfb61dfcea
@ -727,7 +727,7 @@ ea_do_prune(ea_list *e)
|
|||||||
|
|
||||||
/* Now s0 is the most recent version, s[-1] the oldest one */
|
/* Now s0 is the most recent version, s[-1] the oldest one */
|
||||||
/* Drop undefs unless this is a true overlay */
|
/* Drop undefs unless this is a true overlay */
|
||||||
if (s0->undef && !e->next)
|
if (s0->undef && (s[-1].undef || !e->next))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Copy the newest version to destination */
|
/* Copy the newest version to destination */
|
||||||
@ -1081,7 +1081,7 @@ ea_show(struct cli *c, const eattr *e)
|
|||||||
*pos++ = ' ';
|
*pos++ = ' ';
|
||||||
|
|
||||||
if (e->undef)
|
if (e->undef)
|
||||||
bsprintf(pos, "undefined (should not happen)");
|
return;
|
||||||
else if (cls->format)
|
else if (cls->format)
|
||||||
cls->format(e, buf, end - buf);
|
cls->format(e, buf, end - buf);
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user