X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.h;h=de3d583c0d31f7b329fc576e1774628dbf376310;hb=77be52422d8c28735f787b1c233b4cec73d4db56;hp=673573b3d62f6fc34450af2fe7fac4b44a24b145;hpb=d0ba34ccae02d07051bc3f7012a6c116cfb3b653;p=tinc

diff --git a/src/conf.h b/src/conf.h
index 673573b3..de3d583c 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+                            2000 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
@@ -15,6 +16,8 @@
     You should have received a copy of the GNU General Public License
     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 2000/05/30 11:18:12 zarq Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -41,7 +44,8 @@ typedef enum which_t {
   allowconnect,
   pingtimeout,
   keyexpire,
-  proxymode
+  vpnmask,
+  resolve_dns
 } which_t;
 
 typedef struct config_t {