X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=1d9efb646698efbbdaa9fb50241772dd16afb0c7;hp=bc29e071c2539d69d554ae6317ac201a95a2ed2e;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=5df8a8cb3f4a0d2290f6677b44bbcaaf27a60bbc diff --git a/src/conf.c b/src/conf.c index bc29e071..1d9efb64 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,8 +1,8 @@ /* conf.c -- configuration code Copyright (C) 1998 Robert van der Meulen - 1998-2002 Ivo Timmermans - 2000-2002 Guus Sliepen + 1998-2002 Ivo Timmermans + 2000-2002 Guus Sliepen 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify @@ -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.55 2002/04/09 11:42:48 guus Exp $ + $Id: conf.c,v 1.9.4.57 2002/06/21 10:11:12 guus Exp $ */ #include "config.h" @@ -255,8 +255,8 @@ cp /* Teach newbies what subnets are... */ - if(((subnet->type == SUBNET_IPV4) && maskcheck((char *)&subnet->net.ipv4.address, subnet->net.ipv4.prefixlength, sizeof(ipv4_t))) - || ((subnet->type == SUBNET_IPV6) && maskcheck((char *)&subnet->net.ipv6.address, subnet->net.ipv6.prefixlength, 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 prefix length do not match for configuration variable %s in %s line %d"), cfg->variable, cfg->file, cfg->line);