lib: Allow daemons to startup without an actual conf file

If neither a Quagga.conf or <protocol>.conf exist, then
still start the daemon.  Assume that configuration is coming
shortly

Ticket: CM-9714
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:
This commit is contained in:
Donald Sharp 2016-03-07 14:57:16 -05:00
parent f879bbf456
commit 6eda642542

View File

@ -2413,7 +2413,7 @@ vty_read_config (char *config_file,
{ {
ret = stat (integrate_default, &conf_stat); ret = stat (integrate_default, &conf_stat);
if (ret >= 0) if (ret >= 0)
return; goto tmp_free_and_out;
} }
#endif /* VTYSH */ #endif /* VTYSH */
confp = fopen (config_default_dir, "r"); confp = fopen (config_default_dir, "r");
@ -2431,8 +2431,8 @@ vty_read_config (char *config_file,
else else
{ {
fprintf (stderr, "can't open configuration file [%s]\n", fprintf (stderr, "can't open configuration file [%s]\n",
config_default_dir); config_default_dir);
exit (1); goto tmp_free_and_out;
} }
} }
else else
@ -2444,7 +2444,8 @@ vty_read_config (char *config_file,
fclose (confp); fclose (confp);
host_config_set (fullpath); host_config_set (fullpath);
tmp_free_and_out:
if (tmp) if (tmp)
XFREE (MTYPE_TMP, fullpath); XFREE (MTYPE_TMP, fullpath);
} }