X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=96dbef3537cf68f3f2fdfcfc5ee033587f66b46b;hp=3bf9b85f602ca815e77f4d2d86ec1a6498bbfd75;hb=116ba3b3da73fb857cf75b5c92c6aacd70d94dd9;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721 diff --git a/src/conf.c b/src/conf.c index 3bf9b85f..96dbef35 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.53 2002/02/18 16:25:16 guus Exp $ + $Id: conf.c,v 1.9.4.56 2002/06/08 12:57:09 guus Exp $ */ #include "config.h" @@ -127,7 +127,7 @@ cp if(!found) return NULL; - if(strcmp(found->variable, variable)) + if(strcasecmp(found->variable, variable)) return NULL; return found; @@ -145,7 +145,7 @@ cp if(node->next) { found = (config_t *)node->next->data; - if(!strcmp(found->variable, cfg->variable)) + if(!strcasecmp(found->variable, cfg->variable)) return found; } } @@ -255,10 +255,10 @@ cp /* Teach newbies what subnets are... */ - if(((subnet->type == SUBNET_IPV4) && maskcheck((char *)&subnet->net.ipv4.address, subnet->net.ipv4.masklength, sizeof(ipv4_t))) - || ((subnet->type == SUBNET_IPV6) && maskcheck((char *)&subnet->net.ipv6.address, subnet->net.ipv6.masklength, sizeof(ipv6_t)))) + if(((subnet->type == SUBNET_IPV4) && maskcheck(&subnet->net.ipv4.address, subnet->net.ipv4.prefixlength, sizeof(ipv4_t))) + || ((subnet->type == SUBNET_IPV6) && maskcheck(&subnet->net.ipv6.address, subnet->net.ipv6.prefixlength, sizeof(ipv6_t)))) { - syslog(LOG_ERR, _("Network address and mask length do not match for configuration variable %s in %s line %d"), + syslog(LOG_ERR, _("Network address and prefix length do not match for configuration variable %s in %s line %d"), cfg->variable, cfg->file, cfg->line); free(subnet); return 0;