X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=5aaa22a085f3002674ed1fb30134210a3dd103cf;hp=a3c5f693f8052f7b1712ff0c7bccedf62c8154cb;hb=e924096f62655d711cd2d114a8d1ef0fecbb593b;hpb=ab33c1aa6081f07333bf1de00e4036dd2b4628a6 diff --git a/src/conf.c b/src/conf.c index a3c5f693..5aaa22a0 100644 --- a/src/conf.c +++ b/src/conf.c @@ -19,12 +19,11 @@ 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.30 2000/12/01 12:36:36 zarq Exp $ + $Id: conf.c,v 1.9.4.36 2001/01/05 23:53:49 guus Exp $ */ #include "config.h" -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include #include /* for cp */ @@ -58,25 +58,30 @@ int sighup = 0; */ static internal_config_t hazahaza[] = { /* Main configuration file keywords */ - { "Name", config_name, TYPE_NAME }, { "ConnectTo", config_connectto, TYPE_NAME }, - { "PingTimeout", config_pingtimeout, TYPE_INT }, - { "TapDevice", config_tapdevice, TYPE_NAME }, - { "PrivateKey", config_privatekey, TYPE_NAME }, - { "KeyExpire", config_keyexpire, TYPE_INT }, { "Hostnames", config_hostnames, TYPE_BOOL }, { "Interface", config_interface, TYPE_NAME }, { "InterfaceIP", config_interfaceip, TYPE_IP }, + { "KeyExpire", config_keyexpire, TYPE_INT }, + { "MyVirtualIP", config_dummy, TYPE_IP }, + { "MyOwnVPNIP", config_dummy, TYPE_IP }, + { "Name", config_name, TYPE_NAME }, + { "PingTimeout", config_pingtimeout, TYPE_INT }, + { "PrivateKey", config_privatekey, TYPE_NAME }, + { "PrivateKeyFile", config_privatekeyfile, TYPE_NAME }, + { "TapDevice", config_tapdevice, TYPE_NAME }, + { "VpnMask", config_dummy, TYPE_IP }, /* Host configuration file keywords */ { "Address", config_address, TYPE_NAME }, + { "IndirectData", config_indirectdata, TYPE_BOOL }, { "Port", config_port, TYPE_INT }, { "PublicKey", config_publickey, TYPE_NAME }, - { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */ - { "RestrictHosts", config_restricthosts, TYPE_BOOL }, - { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL }, + { "PublicKeyFile", config_publickeyfile, TYPE_NAME }, { "RestrictAddress", config_restrictaddress, TYPE_BOOL }, + { "RestrictHosts", config_restricthosts, TYPE_BOOL }, { "RestrictPort", config_restrictport, TYPE_BOOL }, - { "IndirectData", config_indirectdata, TYPE_BOOL }, + { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL }, + { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */ { "TCPonly", config_tcponly, TYPE_BOOL }, { NULL, 0, 0 } }; @@ -143,7 +148,7 @@ cp 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) +char *readline(FILE *fp, char **buf, size_t *buflen) { char *newline = NULL; char *p; @@ -162,7 +167,7 @@ char *readline(FILE *fp, char *buf, size_t *buflen) if((buf != NULL) && (buflen != NULL)) { size = *buflen; - line = buf; + line = *buf; } else { @@ -206,7 +211,10 @@ char *readline(FILE *fp, char *buf, size_t *buflen) } if((buf != NULL) && (buflen != NULL)) - *buf = size; + { + *buflen = size; + *buf = line; + } return line; } @@ -216,9 +224,9 @@ char *readline(FILE *fp, char *buf, size_t *buflen) */ int read_config_file(config_t **base, const char *fname) { - int err = -1; + int err = -2; /* Parse error */ FILE *fp; - char *line; + char *buffer, *line; char *p, *q; int i, lineno = 0; config_t *cfg; @@ -226,14 +234,18 @@ int read_config_file(config_t **base, const char *fname) cp if((fp = fopen (fname, "r")) == NULL) - return -1; + { + syslog(LOG_ERR, _("Cannot open config file %s: %m"), fname); + return -1; + } bufsize = 100; - line = xmalloc(bufsize); + buffer = xmalloc(bufsize); for(;;) { - if((line = readline(fp, line, &bufsize)) == NULL) + + if((line = readline(fp, &buffer, &bufsize)) == NULL) { err = -1; break; @@ -266,7 +278,7 @@ cp if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#') { - fprintf(stderr, _("No value for variable `%s' on line %d while reading config file %s"), + syslog(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"), hazahaza[i].name, lineno, fname); break; } @@ -274,7 +286,7 @@ cp cfg = add_config_val(base, hazahaza[i].argtype, q); if(cfg == NULL) { - fprintf(stderr, _("Invalid value for variable `%s' on line %d while reading config file %s"), + syslog(LOG_ERR, _("Invalid value for variable `%s' on line %d while reading config file %s"), hazahaza[i].name, lineno, fname); break; } @@ -284,7 +296,7 @@ cp config = cfg; } - free(line); + free(buffer); fclose (fp); cp return err; @@ -297,9 +309,9 @@ int read_server_config() cp asprintf(&fname, "%s/tinc.conf", confbase); x = read_config_file(&config, fname); - if(x != 0) + if(x == -1) /* System error */ { - fprintf(stderr, _("Failed to read `%s': %m\n"), + syslog(LOG_ERR, _("Failed to read `%s': %m"), fname); } free(fname); @@ -346,7 +358,7 @@ int isadir(const char* f) if(stat(f, &s) < 0) { - fprintf(stderr, _("Couldn't stat `%s': %m\n"), + syslog(LOG_ERR, _("Couldn't stat `%s': %m"), f); return -1; } @@ -359,24 +371,29 @@ int is_safe_path(const char *file) char *p; struct stat s; + if(*file != '/') + { + syslog(LOG_ERR, _("`%s' is not an absolute path"), file); + return 0; + } + p = strrchr(file, '/'); - assert(p); /* p has to contain a / */ *p = '\0'; if(stat(file, &s) < 0) { - fprintf(stderr, _("Couldn't stat `%s': %m\n"), + syslog(LOG_ERR, _("Couldn't stat `%s': %m"), file); return 0; } if(s.st_uid != geteuid()) { - fprintf(stderr, _("`%s' is owned by UID %d instead of %d.\n"), + syslog(LOG_ERR, _("`%s' is owned by UID %d instead of %d"), file, s.st_uid, geteuid()); return 0; } if(S_ISLNK(s.st_mode)) { - fprintf(stderr, _("Warning: `%s' is a symlink\n"), + syslog(LOG_WARNING, _("Warning: `%s' is a symlink"), file); /* fixme: read the symlink and start again */ } @@ -384,7 +401,7 @@ int is_safe_path(const char *file) *p = '/'; if(stat(file, &s) < 0 && errno != ENOENT) { - fprintf(stderr, _("Couldn't stat `%s': %m\n"), + syslog(LOG_ERR, _("Couldn't stat `%s': %m"), file); return 0; } @@ -392,20 +409,20 @@ int is_safe_path(const char *file) return 1; if(s.st_uid != geteuid()) { - fprintf(stderr, _("`%s' is owned by UID %d instead of %d.\n"), + syslog(LOG_ERR, _("`%s' is owned by UID %d instead of %d"), file, s.st_uid, geteuid()); return 0; } if(S_ISLNK(s.st_mode)) { - fprintf(stderr, _("Warning: `%s' is a symlink\n"), + syslog(LOG_WARNING, _("Warning: `%s' is a symlink"), file); /* fixme: read the symlink and start again */ } if(s.st_mode & 0007) { /* Accessible by others */ - fprintf(stderr, _("`%s' has unsecure permissions.\n"), + syslog(LOG_ERR, _("`%s' has unsecure permissions"), file); return 0; } @@ -433,12 +450,14 @@ FILE *ask_and_safe_open(const char* filename, const char* what) /* Ask for a file and/or directory name. */ fprintf(stdout, _("Please enter a file to save %s to [%s]: "), what, filename); - fflush(stdout); /* Don't wait for a newline */ + fflush(stdout); + if((fn = readline(stdin, NULL, NULL)) == NULL) { fprintf(stderr, _("Error while reading stdin: %m\n")); return NULL; } + if(strlen(fn) == 0) /* User just pressed enter. */ fn = xstrdup(filename);