- if(strlen(fn) == 0)
- /* User just pressed enter. */
- fn = xstrdup(filename);
- }
-
- if((strchr(fn, '/') == NULL) || (fn[0] != '/'))
- {
- /* The directory is a relative path or a filename. */
- char *p;
-
- directory = get_current_dir_name();
- len = strlen(fn) + strlen(directory) + 2; /* 1 for the / */
- p = xmalloc(len);
- snprintf(p, len, "%s/%s", directory, fn);
- free(fn);
- fn = p;
- }
-
- if(!is_safe_file(fn))
- {
- fprintf(stderr, _("The file `%s' (or any of the leading directories) has unsafe permissions.\n"
- "I will not create or overwrite this file.\n"),
- fn);
- return NULL;
- }
-
- if((r = fopen(fn, "w")) == NULL)
- {
- fprintf(stderr, _("Error opening file `%s': %m\n"),
- fn);
- }
-
- free(fn);
- free(directory);
-
- return r;
+
+ size_t prefix_len = prefix ? strlen(prefix) : 0;
+
+ for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
+ const config_t *cfg = node->data;
+ config_t *new;
+
+ if(!prefix) {
+ if(strchr(cfg->variable, '.')) {
+ continue;
+ }
+ } else {
+ if(strncmp(prefix, cfg->variable, prefix_len) ||
+ cfg->variable[prefix_len] != '.') {
+ continue;
+ }
+ }
+
+ new = new_config();
+
+ if(prefix) {
+ new->variable = xstrdup(cfg->variable + prefix_len + 1);
+ } else {
+ new->variable = xstrdup(cfg->variable);
+ }
+
+ new->value = xstrdup(cfg->value);
+ new->file = NULL;
+ new->line = cfg->line;
+
+ config_add(config_tree, new);
+ }
+}
+
+bool read_server_config(splay_tree_t *config_tree) {
+ char fname[PATH_MAX];
+ bool x;
+
+ read_config_options(config_tree, NULL);
+
+ snprintf(fname, sizeof(fname), "%s" SLASH "tinc.conf", confbase);
+ errno = 0;
+ x = read_config_file(config_tree, fname, true);
+
+ // We will try to read the conf files in the "conf.d" dir
+ if(x) {
+ char dname[PATH_MAX];
+ snprintf(dname, sizeof(dname), "%s" SLASH "conf.d", confbase);
+ DIR *dir = opendir(dname);
+
+ // If we can find this dir
+ if(dir) {
+ struct dirent *ep;
+
+ // We list all the files in it
+ while(x && (ep = readdir(dir))) {
+ size_t l = strlen(ep->d_name);
+
+ // And we try to read the ones that end with ".conf"
+ if(l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
+ if((size_t)snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ep->d_name) >= sizeof(fname)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Pathname too long: %s/%s", dname, ep->d_name);
+ return false;
+ }
+
+ x = read_config_file(config_tree, fname, true);
+ }
+ }
+
+ closedir(dir);
+ }
+ }
+
+ if(!x && errno) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+ }
+
+ return x;
+}
+
+bool read_host_config(splay_tree_t *config_tree, const char *name, bool verbose) {
+ read_config_options(config_tree, name);
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ return read_config_file(config_tree, fname, verbose);
+}
+
+bool append_config_file(const char *name, const char *key, const char *value) {
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+
+ FILE *fp = fopen(fname, "a");
+
+ if(!fp) {
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Cannot open config file %s: %s", fname, strerror(errno));
+ return false;
+ }
+
+ fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value);
+ fclose(fp);
+ return true;