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.39 2001/01/13 16:36:20 guus Exp $
+ $Id: conf.c,v 1.9.4.43 2001/09/01 12:46:49 guus Exp $
*/
#include "config.h"
#include <sys/types.h>
#include <unistd.h>
#include <syslog.h>
+#include <string.h>
#include <xalloc.h>
#include <utils.h> /* for cp */
{ "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
{ "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */
{ "TCPonly", config_tcponly, TYPE_BOOL },
+ { "Mode", config_mode, TYPE_NAME },
{ NULL, 0, 0 }
};
if((fp = fopen (fname, "r")) == NULL)
{
syslog(LOG_ERR, _("Cannot open config file %s: %m"), fname);
- return -1;
+ return -3;
}
bufsize = 100;
cp
asprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(&config, fname);
- if(x == -1) /* System error */
+ if(x == -1) /* System error: complain */
{
syslog(LOG_ERR, _("Failed to read `%s': %m"),
fname);
/*
Look up the value of the config option type
*/
-const config_t *get_config_val(config_t *p, which_t type)
+const config_t *get_config_val(config_t const *p, which_t type)
{
cp
for(; p != NULL; p = p->next)
if((fn = readline(stdin, NULL, NULL)) == NULL)
{
- fprintf(stderr, _("Error while reading stdin: %m\n"));
+ fprintf(stderr, _("Error while reading stdin: %s\n"), strerror(errno));
return NULL;
}
/* Open it first to keep the inode busy */
if((r = fopen(fn, mode)) == NULL)
{
- fprintf(stderr, _("Error opening file `%s': %m\n"),
- fn);
+ fprintf(stderr, _("Error opening file `%s': %s\n"),
+ fn, strerror(errno));
free(fn);
return NULL;
}