proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 18:09:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12184 from nberlee/master

Browse Source 
vtysh: Ensure an empty string does not get printed for host/domain
This commit is contained in:
mobash-rasool 2022-10-25 20:53:50 +05:30 committed by GitHub
commit 12b689e359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtysh/vtysh_config.c
View File

@ -652,18 +652,21 @@ int vtysh_read_config(const char *config_default_dir, bool dry_run)
*/ */
void vtysh_config_write(void) void vtysh_config_write(void)
{ {
const char *name;
char line[512]; char line[512];
if (cmd_hostname_get()) { name = cmd_hostname_get();
snprintf(line, sizeof(line), "hostname %s", cmd_hostname_get()); if (name && name[0] != '\0') {
snprintf(line, sizeof(line), "hostname %s", name);
vtysh_config_parse_line(NULL, line); vtysh_config_parse_line(NULL, line);
} }
if (cmd_domainname_get()) { name = cmd_domainname_get();
snprintf(line, sizeof(line), "domainname %s", if (name && name[0] != '\0') {
cmd_domainname_get()); snprintf(line, sizeof(line), "domainname %s", name);
vtysh_config_parse_line(NULL, line); vtysh_config_parse_line(NULL, line);
} }
if (vtysh_write_integrated == WRITE_INTEGRATED_NO) if (vtysh_write_integrated == WRITE_INTEGRATED_NO)
vtysh_config_parse_line(NULL, vtysh_config_parse_line(NULL,
"no service integrated-vtysh-config"); "no service integrated-vtysh-config");