/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
- 1998-2002 Ivo Timmermans <ivo@o2w.nl>
- 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+ 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+ 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
2000 Cris van Pelt <tribbel@arise.dhs.org>
This program is free software; you can redistribute it and/or modify
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.59 2002/09/09 21:24:25 guus Exp $
+ $Id: conf.c,v 1.9.4.67 2003/07/18 14:10:27 guus Exp $
*/
-#include "config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <xalloc.h>
-#include <utils.h> /* for cp */
-#include <avl_tree.h>
+#include "system.h"
+#include "avl_tree.h"
#include "conf.h"
+#include "logger.h"
#include "netutl.h" /* for str2address */
-
-#include "system.h"
+#include "utils.h" /* for cp */
+#include "xalloc.h"
avl_tree_t *config_tree;
-int debug_lvl = 0;
int pingtimeout = 0; /* seconds before timeout */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
-int config_compare(config_t * a, config_t * b)
+static int config_compare(config_t *a, config_t *b)
{
int result;
return (config_t *) xmalloc_and_zero(sizeof(config_t));
}
-void free_config(config_t * cfg)
+void free_config(config_t *cfg)
{
cp();
free(cfg);
}
-void config_add(avl_tree_t * config_tree, config_t * cfg)
+void config_add(avl_tree_t *config_tree, config_t *cfg)
{
cp();
avl_insert(config_tree, cfg);
}
-config_t *lookup_config(avl_tree_t * config_tree, char *variable)
+config_t *lookup_config(avl_tree_t *config_tree, char *variable)
{
config_t cfg, *found;
return found;
}
-config_t *lookup_config_next(avl_tree_t * config_tree, config_t * cfg)
+config_t *lookup_config_next(avl_tree_t *config_tree, config_t *cfg)
{
avl_node_t *node;
config_t *found;
return NULL;
}
-int get_config_bool(config_t * cfg, int *result)
+int get_config_bool(config_t *cfg, int *result)
{
cp();
return 1;
}
- syslog(LOG_ERR, _("\"yes\" or \"no\" expected for configuration variable %s in %s line %d"),
+ logger(LOG_ERR, _("\"yes\" or \"no\" expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
return 0;
}
-int get_config_int(config_t * cfg, int *result)
+int get_config_int(config_t *cfg, int *result)
{
cp();
if(sscanf(cfg->value, "%d", result) == 1)
return 1;
- syslog(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"),
+ logger(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
return 0;
}
-int get_config_string(config_t * cfg, char **result)
+int get_config_string(config_t *cfg, char **result)
{
cp();
return 1;
}
-int get_config_address(config_t * cfg, struct addrinfo **result)
+int get_config_address(config_t *cfg, struct addrinfo **result)
{
struct addrinfo *ai;
return 1;
}
- syslog(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"),
- cfg->variable, cfg->file, cfg->line);
-
- return 0;
-}
-
-int get_config_port(config_t * cfg, port_t * result)
-{
- cp();
-
- if(!cfg)
- return 0;
-
- if(sscanf(cfg->value, "%hu", result) == 1) {
- *result = htons(*result);
- return 1;
- }
-
- syslog(LOG_ERR, _("Port number expected for configuration variable %s in %s line %d"),
+ logger(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
return 0;
}
-int get_config_subnet(config_t * cfg, subnet_t ** result)
+int get_config_subnet(config_t *cfg, subnet_t ** result)
{
subnet_t *subnet;
subnet = str2net(cfg->value);
if(!subnet) {
- syslog(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
+ logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
return 0;
}
&& maskcheck(&subnet->net.ipv4.address, subnet->net.ipv4.prefixlength, sizeof(ipv4_t)))
|| ((subnet->type == SUBNET_IPV6)
&& maskcheck(&subnet->net.ipv6.address, subnet->net.ipv6.prefixlength, sizeof(ipv6_t)))) {
- syslog(LOG_ERR, _ ("Network address and prefix length do not match for configuration variable %s in %s line %d"),
+ logger(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;
given, and buf needs to be expanded, the var pointed to by buflen
will be increased.
*/
-char *readline(FILE * fp, char **buf, size_t * buflen)
+static char *readline(FILE * fp, char **buf, size_t *buflen)
{
char *newline = NULL;
char *p;
Parse a configuration file and put the results in the configuration tree
starting at *base.
*/
-int read_config_file(avl_tree_t * config_tree, const char *fname)
+int read_config_file(avl_tree_t *config_tree, const char *fname)
{
int err = -2; /* Parse error */
FILE *fp;
fp = fopen(fname, "r");
if(!fp) {
- syslog(LOG_ERR, _("Cannot open config file %s: %s"), fname,
+ logger(LOG_ERR, _("Cannot open config file %s: %s"), fname,
strerror(errno));
return -3;
}
value = strtok(NULL, "\t\n\r =");
if(!value || value[0] == '#') {
- syslog(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
+ logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
variable, lineno, fname);
break;
}
x = read_config_file(config_tree, fname);
if(x == -1) { /* System error: complain */
- syslog(LOG_ERR, _("Failed to read `%s': %s"), fname, strerror(errno));
+ logger(LOG_ERR, _("Failed to read `%s': %s"), fname, strerror(errno));
}
free(fname);
return x;
}
-int isadir(const char *f)
-{
- struct stat s;
-
- if(stat(f, &s) < 0)
- return 0;
- else
- return S_ISDIR(s.st_mode);
-}
-
int is_safe_path(const char *file)
{
+#if !(defined(HAVE_CYGWIN) || defined(HAVE_MINGW))
char *p;
const char *f;
char x;
char l[MAXBUFSIZE];
if(*file != '/') {
- syslog(LOG_ERR, _("`%s' is not an absolute path"), file);
+ logger(LOG_ERR, _("`%s' is not an absolute path"), file);
return 0;
}
check1:
if(lstat(f, &s) < 0) {
- syslog(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
+ logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
return 0;
}
if(s.st_uid != geteuid()) {
- syslog(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
+ logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
return 0;
}
if(S_ISLNK(s.st_mode)) {
- syslog(LOG_WARNING, _("Warning: `%s' is a symlink"), f);
+ logger(LOG_WARNING, _("Warning: `%s' is a symlink"), f);
if(readlink(f, l, MAXBUFSIZE) < 0) {
- syslog(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
+ logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
return 0;
}
check2:
if(lstat(f, &s) < 0 && errno != ENOENT) {
- syslog(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
+ logger(LOG_ERR, _("Couldn't stat `%s': %s"), f, strerror(errno));
return 0;
}
return 1;
if(s.st_uid != geteuid()) {
- syslog(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
+ logger(LOG_ERR, _("`%s' is owned by UID %d instead of %d"),
f, s.st_uid, geteuid());
return 0;
}
if(S_ISLNK(s.st_mode)) {
- syslog(LOG_WARNING, _("Warning: `%s' is a symlink"), f);
+ logger(LOG_WARNING, _("Warning: `%s' is a symlink"), f);
if(readlink(f, l, MAXBUFSIZE) < 0) {
- syslog(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
+ logger(LOG_ERR, _("Unable to read symbolic link `%s': %s"), f,
strerror(errno));
return 0;
}
if(s.st_mode & 0007) {
/* Accessible by others */
- syslog(LOG_ERR, _("`%s' has unsecure permissions"), f);
+ logger(LOG_ERR, _("`%s' has unsecure permissions"), f);
return 0;
}
+#endif
return 1;
}
projects / tinc / blobdiff