X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf.h;h=1be18c3e46168f9a795f4ada142975572dc061c2;hb=d178b583df9fe2bf3ebb3a7377203efc5c46df32;hp=5b0796e5bfbbf4fe5fb38f082a3a0c08390328f6;hpb=6d08eb1614b59d5f86a43edda9db06fca72b76cd;p=tinc

diff --git a/src/conf.h b/src/conf.h
index 5b0796e5..1be18c3e 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,10 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
 #include "avl_tree.h"
 #include "list.h"
 
@@ -38,6 +38,7 @@ extern avl_tree_t *config_tree;
 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
+extern int mintimeout;
 extern bool bypass_security;
 extern char *confbase;
 extern char *netname;
@@ -63,6 +64,5 @@ extern bool read_server_config(void);
 extern bool read_connection_config(struct connection_t *);
 extern FILE *ask_and_open(const char *, const char *);
 extern bool is_safe_path(const char *);
-extern bool disable_old_keys(FILE *);
 
-#endif							/* __TINC_CONF_H__ */
+#endif