matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: Ensure an empty string does not get printed for host/domain

Browse source 
End operator is showing:
!
frr version 8.0.1
frr defaults traditional
hostname test.example.com
domainname

domainname should not be printed in this case at all.  I do not
see any mechanism in current code that this could happen, but
what do I know?  Put some extra stupid insurance in place
to prevent bad config from being generated.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-04-21 14:13:01 -04:00
parent 60d296518b
commit a7141b85c8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/command.c
View file

@ -445,11 +445,15 @@ static bool full_cli;
/* This function write configuration of this host. */ /* This function write configuration of this host. */
static int config_write_host(struct vty *vty) static int config_write_host(struct vty *vty)
{ {
if (cmd_hostname_get()) const char *name;
vty_out(vty, "hostname %s\n", cmd_hostname_get());
if (cmd_domainname_get()) name = cmd_hostname_get();
vty_out(vty, "domainname %s\n", cmd_domainname_get()); if (name && name[0] != '\0')
vty_out(vty, "hostname %s\n", name);
name = cmd_domainname_get();
if (name && name[0] != '\0')
vty_out(vty, "domainname %s\n", name);
/* The following are all configuration commands that are not sent to /* The following are all configuration commands that are not sent to
* watchfrr. For instance watchfrr is hardcoded to log to syslog so * watchfrr. For instance watchfrr is hardcoded to log to syslog so