projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure setlocale() is available.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
b39f4b6
..
1d9efb6
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-1,8
+1,8
@@
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
- 1998-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ 1998-2002 Ivo Timmermans <i
vo@o2w.nl
>
+ 2000-2002 Guus Sliepen <guus@sliepen.
eu.org
>
2000 Cris van Pelt <tribbel@arise.dhs.org>
This program is free software; you can redistribute it and/or modify
2000 Cris van Pelt <tribbel@arise.dhs.org>
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.
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.5
4 2002/03/24 17:14:01
guus Exp $
+ $Id: conf.c,v 1.9.4.5
7 2002/06/21 10:11:12
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-255,10
+255,10
@@
cp
/* Teach newbies what subnets are... */
/* Teach newbies what subnets are... */
- if(((subnet->type == SUBNET_IPV4) && maskcheck(
(char *)&subnet->net.ipv4.address, subnet->net.ipv4.mask
length, sizeof(ipv4_t)))
- || ((subnet->type == SUBNET_IPV6) && maskcheck(
(char *)&subnet->net.ipv6.address, subnet->net.ipv6.mask
length, sizeof(ipv6_t))))
+ if(((subnet->type == SUBNET_IPV4) && maskcheck(
&subnet->net.ipv4.address, subnet->net.ipv4.prefix
length, sizeof(ipv4_t)))
+ || ((subnet->type == SUBNET_IPV6) && maskcheck(
&subnet->net.ipv6.address, subnet->net.ipv6.prefix
length, 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;
cfg->variable, cfg->file, cfg->line);
free(subnet);
return 0;