*** empty log message ***

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 8e3d15a..1988dbd 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.11 2002/04/09 15:26:00 zarq Exp $
+    $Id: conf.c,v 1.12.2.1 2002/04/14 09:30:16 zarq Exp $
 */
 
 #include "config.h"
@@ -30,11 +30,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <string.h>
 
 #include <xalloc.h>
@@ -43,12 +41,12 @@
 
 #include "conf.h"
 #include "netutl.h" /* for str2address */
+#include "logging.h"
 
 #include "system.h"
 
 avl_tree_t *config_tree;
 
-int debug_lvl = 0;
 int pingtimeout = 0;             /* seconds before timeout */
 char *confbase = NULL;           /* directory in which all config files are */
 char *netname = NULL;            /* name of the vpn network */