projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use inttypes.h instead of stdint.h.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
3bf9b85
..
96dbef3
100644
(file)
--- 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.
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
3 2002/02/18 16:25:16
guus Exp $
+ $Id: conf.c,v 1.9.4.5
6 2002/06/08 12:57:09
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-127,7
+127,7
@@
cp
if(!found)
return NULL;
if(!found)
return NULL;
- if(strcmp(found->variable, variable))
+ if(strc
asec
mp(found->variable, variable))
return NULL;
return found;
return NULL;
return found;
@@
-145,7
+145,7
@@
cp
if(node->next)
{
found = (config_t *)node->next->data;
if(node->next)
{
found = (config_t *)node->next->data;
- if(!strcmp(found->variable, cfg->variable))
+ if(!strc
asec
mp(found->variable, cfg->variable))
return found;
}
}
return found;
}
}
@@
-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;