X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=7e135dec0c8f369e48f0840006b91b8529abfb49;hp=640ec1357d69bd89e171560bf8c317fe188a137a;hb=183a8edd22ba4bc682392c73ae02fc9e121eda68;hpb=6e39481d8f2406e60b5e329ace08b5a005d5cc43

diff --git a/src/conf.c b/src/conf.c
index 640ec135..7e135dec 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,18 +19,17 @@
     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.9.4.11 2000/10/11 13:42:52 guus Exp $
+    $Id: conf.c,v 1.9.4.12 2000/10/11 22:00:57 guus Exp $
 */
 
 
-#include "config.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 
 #include <xalloc.h>
 
@@ -38,6 +37,8 @@
 #include "netutl.h" /* for strtoip */
 #include <utils.h> /* for cp */
 
+#include "config.h"
+
 #include "system.h"
 
 config_t *config;
@@ -139,11 +140,11 @@ cp
 */
 int read_config_file(config_t **base, const char *fname)
 {
-  int err;
+  int err = -1;
   FILE *fp;
   char line[MAXBUFSIZE];	/* There really should not be any line longer than this... */
   char *p, *q;
-  int i, err = -1, lineno = 0;
+  int i, lineno = 0;
   config_t *cfg;
 cp
   if((fp = fopen (fname, "r")) == NULL)