summaryrefslogtreecommitdiffabout
path: root/src/bindcf.c
Side-by-side diff
Diffstat (limited to 'src/bindcf.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/bindcf.c180
1 files changed, 136 insertions, 44 deletions
diff --git a/src/bindcf.c b/src/bindcf.c
index e5fdd67..932b65b 100644
--- a/src/bindcf.c
+++ b/src/bindcf.c
@@ -21,9 +21,36 @@ struct grecs_list *bind_include_path;
char *zone_file_pattern = "$zone.$synctag";
char *zone_conf_file;
-static char *bind_working_dir;
+char *bind_working_dir;
static struct grecs_node *bind_tree;
+struct filesym {
+ const char *name;
+ struct grecs_node *node;
+};
+static struct grecs_symtab *filetab;
+
+static struct grecs_node *
+find_file(const char *name, struct grecs_node *node)
+{
+ int install = 1;
+ struct filesym key, *ret;
+ if (!filetab) {
+ filetab = grecs_symtab_create_default(sizeof(struct filesym));
+ if (!filetab)
+ grecs_alloc_die();
+ }
+ key.name = name;
+ ret = grecs_symtab_lookup_or_install(filetab, &key, &install);
+ if (!ret)
+ grecs_alloc_die();
+ if (install) {
+ ret->node = node;
+ return NULL;
+ }
+ return ret->node;
+}
+
void
source_named_conf()
{
@@ -134,6 +161,10 @@ static void
new_zone(struct nssync *sp, const char *zone, char *file)
{
struct grecs_node *node, *np;
+#define fake_locus(n) do { \
+ (n)->locus.file = __FILE__; \
+ (n)->locus.line = __LINE__; \
+ } while (0)
debug(1, ("%s: creating new zone file for %s, file %s", sp->tag,
zone, file));
@@ -143,20 +174,24 @@ new_zone(struct nssync *sp, const char *zone, char *file)
node->v.value = grecs_malloc(sizeof(node->v.value[0]));
node->v.value->type = GRECS_TYPE_STRING;
node->v.value->v.string = grecs_strdup(zone);
-
+ fake_locus(node);
+
np = grecs_node_create(grecs_node_stmt, NULL);
np->ident = "file";
np->v.value = grecs_malloc(sizeof(np->v.value[0]));
np->v.value->type = GRECS_TYPE_STRING;
np->v.value->v.string = grecs_strdup(file);
-
+ fake_locus(node);
+
node->down = np;
np = grecs_node_create(grecs_node_stmt, NULL);
np->ident = "$found$";
+ fake_locus(node);
grecs_node_bind(node, np, 1);
grecs_node_bind(sp->zone_tree, node, 1);
+#undef fake_locus
}
#define is_safe_char(c) \
@@ -196,11 +231,35 @@ safe_filename(const char *file)
return name;
}
-char *
-bindcf_lookup(struct nssync *sp, const char *zone)
+static char *
+bindcf_zone_name(struct nssync *sp, const char *zone)
{
+ char *name;
char *env[5];
struct wordsplit ws;
+
+ env[0] = "zone";
+ env[1] = safe_filename(zone);
+ env[2] = "synctag";
+ env[3] = sp->tag;
+ env[4] = NULL;
+ ws.ws_env = (const char**)env;
+ if (wordsplit(sp->zone_file_pattern, &ws,
+ WRDSF_NOCMD | WRDSF_ENV | WRDSF_ENV_KV |
+ WRDSF_NOSPLIT | WRDSF_KEEPUNDEF)) {
+ error("cannot split zone-file-pattern: %s",
+ wordsplit_strerror(&ws));
+ exit(EX_SOFTWARE);
+ }
+ grecs_free(env[1]);
+ name = absolute_name(ws.ws_wordv[0], bind_working_dir);
+ wordsplit_free(&ws);
+ return name;
+}
+
+char *
+bindcf_lookup(struct nssync *sp, const char *zone)
+{
char *name;
struct grecs_node *node;
@@ -212,7 +271,10 @@ bindcf_lookup(struct nssync *sp, const char *zone)
strcasecmp(node->v.value->v.string, zone) == 0)
break;
+ name = bindcf_zone_name(sp, zone);
+
if (node) {
+ char *oname;
struct grecs_node *np = grecs_find_node(node->down, "file");
if (!np) {
error("%s:%d: no file statement in zone!",
@@ -223,13 +285,25 @@ bindcf_lookup(struct nssync *sp, const char *zone)
if (np->type != grecs_node_stmt ||
!np->v.value ||
np->v.value->type != GRECS_TYPE_STRING) {
- error("%s:%d: suspicious file statement",
- np->locus.file, np->locus.line);
+ grecs_error(&np->locus, 0,
+ "suspicious file statement");
error_count++;
return NULL;
}
- name = absolute_name(np->v.value->v.string, bind_working_dir);
-
+ oname = absolute_name(np->v.value->v.string, bind_working_dir);
+ if (strcmp(oname, name)) {
+ debug(1, ("renaming zone file %s to %s", oname, name));
+ if (move_file(oname, name)) {
+ free(oname);
+ free(name);
+ error_count++;
+ return NULL;
+ }
+ grecs_free(np->v.value->v.string);
+ np->v.value->v.string = name;
+ name = grecs_strdup(np->v.value->v.string);
+ }
+
np = grecs_node_create(grecs_node_stmt, NULL);
np->ident = "$found$";
grecs_node_bind(node, np, 1);
@@ -237,23 +311,7 @@ bindcf_lookup(struct nssync *sp, const char *zone)
}
/* No zone statement: new zone */
- env[0] = "zone";
- env[1] = safe_filename(zone);
- env[2] = "synctag";
- env[3] = sp->tag;
- env[4] = NULL;
- ws.ws_env = (const char**)env;
- if (wordsplit(sp->zone_file_pattern, &ws,
- WRDSF_NOCMD | WRDSF_ENV | WRDSF_ENV_KV |
- WRDSF_NOSPLIT | WRDSF_KEEPUNDEF)) {
- error("cannot split zone-file-pattern: %s",
- wordsplit_strerror(&ws));
- exit(EX_SOFTWARE);
- }
- grecs_free(env[1]);
- name = absolute_name(ws.ws_wordv[0], bind_working_dir);
- wordsplit_free(&ws);
-
+ name = bindcf_zone_name(sp, zone);
new_zone(sp, zone, name);
return name;
}
@@ -304,27 +362,61 @@ flush_zone_list(struct nssync *sp)
PACKAGE_STRING);
fprintf(fp, "# Do not edit! See %s for details\n", config_file);
for (node = sp->zone_tree->down; node; node = node->next) {
+ struct grecs_node *file_node =
+ grecs_find_node(node->down, "file");
+ char *file = NULL;
+ struct grecs_node *np = NULL;
+
+ if (file_node) {
+ file = absolute_name(file_node->v.value->v.string,
+ bind_working_dir);
+ np = find_file(file, file_node);
+ }
+
if (grecs_find_node(node->down, "$found$")) {
+ if (np) {
+ int fd;
+ char *new_name = NULL;
+ size_t size = 0;
+
+ if (grecs_asprintf(&new_name, &size,
+ "%s.XXXXXX",
+ file_node->v.value->v.string))
+ grecs_alloc_die();
+ fd = mkstemp(new_name);
+ if (fd == -1) {
+ grecs_error(&node->locus, 0,
+ "can't create temporary: "
+ "%s",
+ strerror(errno));
+ error_count++;
+ continue;
+ }
+ close(fd);
+ grecs_warning(&node->locus, 0,
+ "file %s already in use; "
+ "using %s instead",
+ file_node->v.value->v.string,
+ new_name);
+ grecs_warning(&np->locus, 0,
+ "this is the location of "
+ "the previous definition");
+ grecs_free(file_node->v.value->v.string);
+ file_node->v.value->v.string = new_name;
+ }
output_zone(fp, node);
zone_count++;
- } else {
- char *file;
- struct grecs_node *np = grecs_find_node(node->down,
- "file");
- if (!np) {
- error("about to delete zone %s, which has "
- "no file definition",
- node->v.value->v.string);
- } else if (file =
- absolute_name(np->v.value->v.string,
- bind_working_dir)) {
- debug(1, ("deleting zone %s, file %s",
- node->v.value->v.string,
- file));
- if (!dry_run_mode && unlink(file)) {
- error("unlink(%s): %s",
- file, strerror(errno));
- }
+ } else if (!file_node) {
+ error("about to delete zone %s, which has "
+ "no file definition",
+ node->v.value->v.string);
+ } else if (file && !np) {
+ debug(1, ("deleting zone %s, file %s",
+ node->v.value->v.string,
+ file));
+ if (!dry_run_mode && unlink(file)) {
+ error("unlink(%s): %s",
+ file, strerror(errno));
}
}
}

Return to:

Send suggestions and report system problems to the System administrator.