X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=3be2e33eda1874f6bf71d1dbadbaa5c8eb16b55a;hp=951b24a6008c400fa7f1f22ecae8635196507987;hb=a59bbc72317c9cd97243a9cbf49db01ff249eb1e;hpb=72395f989cb44132d7c756c91b3a6d8ba63517e5

diff --git a/src/conf.c b/src/conf.c
index 951b24a6..3be2e33e 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.48 2001/11/16 00:13:08 zarq Exp $
+    $Id: conf.c,v 1.9.4.51 2001/11/16 22:31:41 zarq Exp $
 */
 
 #include "config.h"
@@ -42,7 +42,6 @@
 #include <avl_tree.h>
 
 #include "conf.h"
-#include "netutl.h" /* for strtoip */
 
 #include "system.h"
 
@@ -167,7 +166,7 @@ cp
       *result = 1;
       return 1;
     }
-  else if(!strcasecmp(cfg->value, "np"))
+  else if(!strcasecmp(cfg->value, "no"))
     {
       *result = 0;
       return 1;
@@ -205,39 +204,39 @@ cp
 
 int get_config_subnet(config_t *cfg, subnet_t **result)
 {
-  ip_mask_t *ip;
   subnet_t *subnet;
 cp
   if(!cfg)
     return 0;
 
-  ip = strtoip(cfg->value);
+#warning FIXME 
+/*   ip = strtoip(cfg->value); */
 
-  if(!ip)
-    {
-      syslog(LOG_ERR, _("IP address expected for configuration variable %s in %s line %d"),
-             cfg->variable, cfg->file, cfg->line);
-      return 0;
-    }
+/*   if(!ip) */
+/*     { */
+/*       syslog(LOG_ERR, _("IP address expected for configuration variable %s in %s line %d"), */
+/*              cfg->variable, cfg->file, cfg->line); */
+/*       return 0; */
+/*     } */
   
   /* Teach newbies what subnets are... */
 
-  if((ip->address & ip->mask) != ip->address)
-    {
-      syslog(LOG_ERR, _("Network address and subnet mask for configuration variable %s in %s line %d"),
-             cfg->variable, cfg->file, cfg->line);
-      free(ip);
-      return 0;
-    }
-
-  subnet = new_subnet();
-  subnet->type = SUBNET_IPV4;
-  subnet->net.ipv4.address = ip->address;
-  subnet->net.ipv4.mask = ip->mask;
+/*   if((ip->address & ip->mask) != ip->address) */
+/*     { */
+/*       syslog(LOG_ERR, _("Network address and subnet mask for configuration variable %s in %s line %d"), */
+/*              cfg->variable, cfg->file, cfg->line); */
+/*       free(ip); */
+/*       return 0; */
+/*     } */
+
+/*   subnet = new_subnet(); */
+/*   subnet->type = SUBNET_IP; */
+/*   subnet->net.ip.address = ip->address; */
+/*   subnet->net.ip.mask = ip->mask; */
   
-  free(ip);
+/*   free(ip); */
 
-  *result = subnet;
+/*   *result = subnet; */
   
   return 1;
 }