Return non-zero exit code when encountering configuration errors during startup.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index b6a6c29..c3cae5d 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -97,7 +97,7 @@ char *pidfilename = NULL;                     /* pid file location */
 char *logfilename = NULL;                      /* log file location */
 char **g_argv;                                 /* a copy of the cmdline arguments */
 
 char *logfilename = NULL;                      /* log file location */
 char **g_argv;                                 /* a copy of the cmdline arguments */
 

-static int status;
+static int status = 1;

 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},
 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},


@@ -438,14 +438,14 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
 #ifdef HAVE_MINGW
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {

-                       if(!logfilename)
-                               xasprintf(&logfilename, "%s/log/%s.log", identname);

                        if(!confbase) {
                                if(netname)
                                        xasprintf(&confbase, "%s/%s", installdir, netname);
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }
                        if(!confbase) {
                                if(netname)
                                        xasprintf(&confbase, "%s/%s", installdir, netname);
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }

+                       if(!logfilename)
+                               xasprintf(&logfilename, "%s/tinc.log", confbase);

                }
                RegCloseKey(key);
                if(*installdir)
                }
                RegCloseKey(key);
                if(*installdir)