projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://schlaile@git.misdn.org/var/git/lcr
[lcr.git]
/
route.c
diff --git
a/route.c
b/route.c
index
ce5d226
..
29381c2
100644
(file)
--- a/
route.c
+++ b/
route.c
@@
-875,7
+875,7
@@
struct route_ruleset *ruleset_parse(void)
j<<=1;
}
j<<=1;
}
- SPRINT(filename[0], "%s/routing.conf",
INSTALL
_DATA);
+ SPRINT(filename[0], "%s/routing.conf",
CONFIG
_DATA);
if (!(fp[0]=fopen(filename[0],"r")))
{
if (!(fp[0]=fopen(filename[0],"r")))
{
@@
-943,7
+943,7
@@
struct route_ruleset *ruleset_parse(void)
if (key[0] == '/')
SCPY(filename[nesting+1], key);
else
if (key[0] == '/')
SCPY(filename[nesting+1], key);
else
- SPRINT(filename[nesting+1], "%s/%s",
INSTALL
_DATA, key);
+ SPRINT(filename[nesting+1], "%s/%s",
CONFIG
_DATA, key);
if (!(fp[nesting+1]=fopen(filename[nesting+1],"r")))
{
PERROR("Cannot open %s\n", filename[nesting+1]);
if (!(fp[nesting+1]=fopen(filename[nesting+1],"r")))
{
PERROR("Cannot open %s\n", filename[nesting+1]);