X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=dce3802fc11adf0e879f4f7a7fa4cfd3c2b2c53f;hp=9ab0add63884ee8f6efe5b72007f365ae249b9be;hb=d3f889c8076dff9c00ebfe1459cb36425f8da41d;hpb=698191fd2f512f3618e2d60592fcd57cd750b965

diff --git a/src/conf.h b/src/conf.h
index 9ab0add6..dce3802f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
-                            2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -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.16 2000/11/04 22:57:30 guus Exp $
+    $Id: conf.h,v 1.6.4.21 2001/01/07 17:08:56 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -33,11 +33,13 @@ typedef struct ip_mask_t {
 } ip_mask_t;
 
 typedef enum which_t {
+  config_dummy = 0,
   config_name = 1,
   config_connectto,
   config_pingtimeout,
   config_tapdevice,
   config_privatekey,
+  config_privatekeyfile,
   config_keyexpire,
   config_hostnames,
   config_interface,
@@ -45,6 +47,7 @@ typedef enum which_t {
   config_address,
   config_port,
   config_publickey,
+  config_publickeyfile,
   config_subnet,
   config_restricthosts,
   config_restrictsubnets,
@@ -60,7 +63,7 @@ typedef struct config_t {
   int argtype;
   union data {
     unsigned long val;
-    void *ptr;
+    char *ptr;
     ip_mask_t *ip;
     struct config_t *next;	/* For nested configs! */
   } data;
@@ -96,5 +99,6 @@ extern int read_config_file(config_t **, const char *);
 extern const config_t *get_config_val(config_t *, which_t type);
 extern void clear_config();
 extern int read_server_config(void);
+extern FILE *ask_and_safe_open(const char*, const char*);
 
 #endif /* __TINC_CONF_H__ */