From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 7 Mar 2016 19:57:16 +0000 (-0500)
Subject: lib: Allow daemons to startup without an actual conf file
X-Git-Tag: frr-2.0-rc1~1071
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6eda64254218e9711d126e68d4e5c33c9107d8c9;p=mirror%2Ffrr.git

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:
---

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