diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp.c | 18 | ||||
| -rw-r--r-- | src/meta1parse.c | 6 |
2 files changed, 16 insertions, 8 deletions
@@ -660,19 +660,25 @@ component_verify (struct component *comp, grecs_locus_t *locus) else if (comp->flags & CF_WAIT) { /* TRANSLATORS: `wait' is a keywords, do not translate. */ COMPERR (grecs_error, "%s", _("wait is useless in this mode")); comp->flags &= ~CF_WAIT; } - - if (comp->mode != pies_comp_exec - && comp->redir[RETR_OUT].type != redir_null) + + switch (comp->mode) { - COMPERR (grecs_error, - "%s", _("stdout redirection invalid in this mode")); - comp->redir[RETR_OUT].type = redir_null; + case pies_comp_accept: + case pies_comp_inetd: + if (comp->redir[RETR_OUT].type != redir_null) + { + COMPERR (grecs_error, + "%s", _("stdout redirection invalid in this mode")); + comp->redir[RETR_OUT].type = redir_null; + } + default: + break; } for (i = RETR_OUT; i <= RETR_ERR; i++) { if (comp->redir[i].type == redir_file && comp->redir[i].v.file[0] != '/') diff --git a/src/meta1parse.c b/src/meta1parse.c index 4b2fccb..528a80a 100644 --- a/src/meta1parse.c +++ b/src/meta1parse.c @@ -292,13 +292,15 @@ static int meta1_translate_node (struct grecs_node *node) { struct component *comp; struct grecs_node *stmt; size_t len; int err = 0; - + + if (node->type != grecs_node_block) + return 0; comp = component_create (node->ident); for (stmt = node->down; stmt; stmt = stmt->next) { if (meta1_translate_stmt (stmt, comp)) ++err; } @@ -306,13 +308,13 @@ meta1_translate_node (struct grecs_node *node) { component_free (comp); return -1; } comp->privs.allgroups = 1; - comp->dir = META1_QUEUE_DIR (); + comp->dir = grecs_strdup (META1_QUEUE_DIR ()); comp->redir[RETR_ERR].type = redir_file; comp->redir[RETR_ERR].v.file = NULL; len = 0; grecs_asprintf (&comp->redir[RETR_ERR].v.file, &len, "%s/%s.log", META1_QUEUE_DIR (), comp->tag); component_finish (comp, &node->locus); |