X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=2ab9ba7a09160d8b14bbb0cad35ef5f66c897f24;hb=7c223917cb3d478fc3f5b23ee5602925f083e4d4;hp=72bd8f3134b65cf3baee793449b885bee866dab3;hpb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 72bd8f31..2ab9ba7a 100644
--- 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-2015 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 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>
@@ -346,7 +346,7 @@ int main(int argc, char **argv) {
 	if(show_version) {
 		printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
 			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-		printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf("Copyright (C) 1998-2016 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"
 				"and you are welcome to redistribute it under certain conditions;\n"
@@ -400,6 +400,9 @@ int main(int argc, char **argv) {
 	if(!read_server_config())
 		return 1;
 
+	if(!debug_level)
+		get_config_int(lookup_config(config_tree, "LogLevel"), &debug_level);
+
 #ifdef HAVE_LZO
 	if(lzo_init() != LZO_E_OK) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing LZO compressor!");