X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=00fbcb19d83e052e992218275f2d5f7308dd6ece;hp=297dc42b2838d931ac0db742c2964df1421911d1;hb=e924096f62655d711cd2d114a8d1ef0fecbb593b;hpb=54ef13bf75a7a1e787716ce395ffe847fa74673f

diff --git a/src/conf.h b/src/conf.h
index 297dc42b..00fbcb19 100644
--- 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.17 2000/11/29 14:24:40 zarq Exp $
+    $Id: conf.h,v 1.6.4.20 2001/01/05 23:53:49 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;