projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow compilation from a build directory
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
e2b6442
..
99bf381
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-2,7
+2,7
@@
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
- 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
4
Guus Sliepen <guus@tinc-vpn.org>
2010-2011 Julien Muchembled <jm@jmuchemb.eu>
2000 Cris van Pelt
2010-2011 Julien Muchembled <jm@jmuchemb.eu>
2000 Cris van Pelt
@@
-393,7
+393,6
@@
bool read_server_config(void) {
if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
free(fname);
xasprintf(&fname, "%s/%s", dname, ep->d_name);
if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
free(fname);
xasprintf(&fname, "%s/%s", dname, ep->d_name);
- logger(LOG_DEBUG, "Reading conf file \"%s\"", fname);
x = read_config_file(config_tree, fname);
}
}
x = read_config_file(config_tree, fname);
}
}