projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up child processes from proxy type exec.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
c4f8abb
..
3c64519
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-71,7
+71,7
@@
void exit_configuration(splay_tree_t ** config_tree) {
}
config_t *new_config(void) {
}
config_t *new_config(void) {
- return x
malloc_and_zero
(sizeof(config_t));
+ return x
zalloc
(sizeof(config_t));
}
void free_config(config_t *cfg) {
}
void free_config(config_t *cfg) {
@@
-373,9
+373,10
@@
bool read_server_config(void) {
read_config_options(config_tree, NULL);
xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
read_config_options(config_tree, NULL);
xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+ errno = 0;
x = read_config_file(config_tree, fname);
x = read_config_file(config_tree, fname);
- if(!x)
+ if(!x
&& errno
)
logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
free(fname);
logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
free(fname);