- Second fixing-things pass: it even links now.

[oweals/tinc.git] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index f17b6ed84db33ce543a62fde055747cb87166b35..a1ab1620cd81dc65934c2cb550b3aa787653dc2d 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.h,v 1.6.4.11 2000/10/11 22:00:58 guus Exp $
+    $Id: conf.h,v 1.6.4.12 2000/10/14 17:04:13 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -87,12 +87,13 @@ extern int debug_lvl;
 extern int timeout;
 extern int upstreamindex;
 extern int sighup;
-extern char *configfilename;
+extern char *confbase;
 
 extern config_t *add_config_val(config_t **, int, char *);
 extern int read_config_file(config_t **, const char *);
 extern const config_t *get_config_val(config_t *, which_t type);
 extern const config_t *get_next_config_val(config_t *, which_t type, int);
 extern void clear_config();
+extern int read_server_config(void);
 
 #endif /* __TINC_CONF_H__ */