projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid using a variable named "sun". Solaris doesn't like it.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
b9bfbf6
..
3c64519
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
3
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
@@
-28,6
+28,7
@@
#include "conf.h"
#include "list.h"
#include "logger.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
+#include "names.h"
#include "netutl.h" /* for str2address */
#include "protocol.h"
#include "utils.h" /* for cp */
#include "netutl.h" /* for str2address */
#include "protocol.h"
#include "utils.h" /* for cp */
@@
-37,11
+38,8
@@
splay_tree_t *config_tree;
int pinginterval = 0; /* seconds between pings */
int pingtimeout = 0; /* seconds to wait for response */
int pinginterval = 0; /* seconds between pings */
int pingtimeout = 0; /* seconds to wait for response */
-char *confbase = NULL; /* directory in which all config files are */
-char *netname = NULL; /* name of the vpn network */
list_t *cmdline_conf = NULL; /* global/host configuration values given at the command line */
list_t *cmdline_conf = NULL; /* global/host configuration values given at the command line */
-
static int config_compare(const config_t *a, const config_t *b) {
int result;
static int config_compare(const config_t *a, const config_t *b) {
int result;
@@
-73,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) {
@@
-375,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);