commit - 9269f2d377c685da62d58b8d552b791ba2cc9f0c8cc849f561d1ac57baf2d377
commit + 680b14d522e2a8d123c645c36318bed8488b96b34bb8ca04b47f7cf22c20f5b0
blob - 4c9f9cf63f84a0ff107ec589d09f4bd75218c89a2f06f3b3af1cfeda28d6c850
blob + 4edb285b4263a223674828e9ddabf05b6ca326b914667716ebb8a56eca75b8fb
--- gotsysd/parse.y
+++ gotsysd/parse.y
gotsysd->uid_end = GOTSYSD_UID_DEFAULT_END;
file = newfile(filename, 0, 0);
- if (file == NULL)
- return require_config_file ? -1 : 0;
+ if (file == NULL) {
+ if (require_config_file)
+ return -1;
+ } else {
+ yyparse();
+ errors = file->errors;
+ closefile(file);
- yyparse();
- errors = file->errors;
- closefile(file);
-
- /* Free macros and check which have not been used. */
- TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
- if ((gotsysd->verbosity > 1) && !sym->used)
- fprintf(stderr, "warning: macro '%s' not used\n",
- sym->nam);
- if (!sym->persist) {
- free(sym->nam);
- free(sym->val);
- TAILQ_REMOVE(&symhead, sym, entry);
- free(sym);
+ /* Free macros and check which have not been used. */
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
+ if ((gotsysd->verbosity > 1) && !sym->used)
+ fprintf(stderr,
+ "warning: macro '%s' not used\n", sym->nam);
+ if (!sym->persist) {
+ free(sym->nam);
+ free(sym->val);
+ TAILQ_REMOVE(&symhead, sym, entry);
+ free(sym);
+ }
}
+
+ if (errors)
+ return (-1);
}
- if (errors)
- return (-1);
-
if (proc_id == GOTSYSD_PROC_AUTH &&
STAILQ_EMPTY(&gotsysd->access_rules)) {
char *identifier = strdup("0"); /* root */