X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=226f4f5e9911ac23e3deb0694bb7d8ae94cd72e2;hb=c46bdbde18629f0a0613c776c13a79fea0ec6093;hp=c4806bace75a288d9c9e1179c58923b93334c8d6;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index c4806bac..226f4f5e 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++];
@@ -341,7 +343,7 @@ int main(int argc, char **argv) {
 
 	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"