Fix check for LOCALSTATEDIR accessibility for the CLI.

[oweals/tinc.git] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index c4806bace75a288d9c9e1179c58923b93334c8d6..fb2a1557aa7fb0b59fd8e2d406c6cc0c189a5321 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -187,6 +187,7 @@ static bool parse_options(int argc, char **argv) {
                                break;
 
                        case 's': /* syslog */
+                               use_logfile = false;
                                use_syslog = true;
                                break;
 
@@ -225,6 +226,7 @@ static bool parse_options(int argc, char **argv) {
                                break;
 
                        case 4:   /* write log entries to a file */
+                               use_syslog = false;
                                use_logfile = true;
                                if(!optarg && optind < argc && *argv[optind] != '-')
                                        optarg = argv[optind++];
@@ -337,11 +339,11 @@ int main(int argc, char **argv) {
        if(!parse_options(argc, argv))
                return 1;
 
-       make_names();
+       make_names(true);
 
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
-                          VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+                          BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
                printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"