From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 14 Mar 2015 12:02:29 +0000 (+0000)
Subject: --syslog and --logfile are mutually exclusive.
X-Git-Tag: release-1.1pre12~194
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=6568cffd52d4803effaf52a9bb9c98d69cf7922a

--syslog and --logfile are mutually exclusive.
---

diff --git a/src/tincd.c b/src/tincd.c
index c4806bac..d497bccc 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -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++];