X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=272beb6a44ca43883b64b2e27f19a64638c558d4;hp=a3c5f693f8052f7b1712ff0c7bccedf62c8154cb;hb=01d23601a273d128ebfd13c2ffa10892e9b13094;hpb=ab33c1aa6081f07333bf1de00e4036dd2b4628a6

diff --git a/src/conf.c b/src/conf.c
index a3c5f693..272beb6a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.30 2000/12/01 12:36:36 zarq Exp $
+    $Id: conf.c,v 1.9.4.32 2000/12/03 12:22:19 zarq Exp $
 */
 
 #include "config.h"
@@ -58,25 +58,25 @@ int sighup = 0;
 */
 static internal_config_t hazahaza[] = {
 /* Main configuration file keywords */
-  { "Name",         config_name,       TYPE_NAME },
   { "ConnectTo",    config_connectto,      TYPE_NAME },
-  { "PingTimeout",  config_pingtimeout,    TYPE_INT },
-  { "TapDevice",    config_tapdevice,      TYPE_NAME },
-  { "PrivateKey",   config_privatekey,     TYPE_NAME },
-  { "KeyExpire",    config_keyexpire,      TYPE_INT },
   { "Hostnames",    config_hostnames,    TYPE_BOOL },
   { "Interface",    config_interface,      TYPE_NAME },
   { "InterfaceIP",  config_interfaceip,    TYPE_IP },
+  { "KeyExpire",    config_keyexpire,      TYPE_INT },
+  { "Name",         config_name,       TYPE_NAME },
+  { "PingTimeout",  config_pingtimeout,    TYPE_INT },
+  { "PrivateKey",   config_privatekey,     TYPE_NAME },
+  { "TapDevice",    config_tapdevice,      TYPE_NAME },
 /* Host configuration file keywords */
   { "Address",      config_address,        TYPE_NAME },
+  { "IndirectData", config_indirectdata,   TYPE_BOOL },
   { "Port",         config_port,           TYPE_INT },
   { "PublicKey",    config_publickey,      TYPE_NAME },
-  { "Subnet",       config_subnet,         TYPE_IP },		/* Use IPv4 subnets only for now */
-  { "RestrictHosts", config_restricthosts, TYPE_BOOL },
-  { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
   { "RestrictAddress", config_restrictaddress, TYPE_BOOL },
+  { "RestrictHosts", config_restricthosts, TYPE_BOOL },
   { "RestrictPort", config_restrictport,   TYPE_BOOL },
-  { "IndirectData", config_indirectdata,   TYPE_BOOL },
+  { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
+  { "Subnet",       config_subnet,         TYPE_IP },		/* Use IPv4 subnets only for now */
   { "TCPonly",      config_tcponly,        TYPE_BOOL },
   { NULL, 0, 0 }
 };
@@ -218,7 +218,7 @@ int read_config_file(config_t **base, const char *fname)
 {
   int err = -1;
   FILE *fp;
-  char *line;
+  char *buffer, *line;
   char *p, *q;
   int i, lineno = 0;
   config_t *cfg;
@@ -229,11 +229,11 @@ cp
     return -1;
 
   bufsize = 100;
-  line = xmalloc(bufsize);
+  buffer = xmalloc(bufsize);
   
   for(;;)
     {
-      if((line = readline(fp, line, &bufsize)) == NULL)
+      if((line = readline(fp, buffer, &bufsize)) == NULL)
 	{
 	  err = -1;
 	  break;
@@ -284,7 +284,7 @@ cp
 	config = cfg;
     }
 
-  free(line);
+  free(buffer);
   fclose (fp);
 cp
   return err;