Merge branch 'master' into 1.1

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index ee20c29cce4a22850a3cacd22667cb365937e7e8..dfa1123100142dad2b2416e7afc55a5b26383577 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -60,5 +60,6 @@ extern int read_config_file(splay_tree_t *, const char *);
 extern bool read_server_config(void);
 extern FILE *ask_and_open(const char *, const char *, const char *);
 extern bool is_safe_path(const char *);
+extern bool disable_old_keys(FILE *);
 
 #endif                                                 /* __TINC_CONF_H__ */