diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-02-27 15:36:43 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-02-27 15:36:43 +0000 |
| commit | f5a9e2f62deaf0e55a82aade816e3bf32c8ee646 (patch) | |
| tree | 43fd6b0ee66026e10fd7736444c27ba11f751824 /usr.sbin | |
| parent | 4f609e8c67f2c77e5f755e2a57fea77522b23b8c (diff) | |
Unbreak parser by initializing topfile correctly.
I got fooled by patch(1). Sorry.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dvmrpd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/hostapd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/ripd/parse.y | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/dvmrpd/parse.y b/usr.sbin/dvmrpd/parse.y index 226e96f7170..72d3be96505 100644 --- a/usr.sbin/dvmrpd/parse.y +++ b/usr.sbin/dvmrpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.14 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.15 2008/02/27 15:36:42 mpf Exp $ */ /* * Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org> @@ -713,7 +713,6 @@ parse_config(char *filename, int opts) errx(1, "parse_config calloc"); return (NULL); } - topfile = file; defs = &globaldefs; defs->probe_interval = DEFAULT_PROBE_INTERVAL; @@ -732,6 +731,7 @@ parse_config(char *filename, int opts) free(conf); return (NULL); } + topfile = file; /* Generation ID must be non decreasing */ gettimeofday(&now, NULL); diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y index 820917e4b3b..686f8f954d1 100644 --- a/usr.sbin/hostapd/parse.y +++ b/usr.sbin/hostapd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.37 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.38 2008/02/27 15:36:42 mpf Exp $ */ /* * Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org> @@ -1711,6 +1711,7 @@ hostapd_parse_file(struct hostapd_config *cfg) if ((file = pushfile(cfg->c_config, 1)) == NULL) hostapd_fatal("failed to open the main config file: %s\n", cfg->c_config); + topfile = file; /* Init tables and data structures */ TAILQ_INIT(&cfg->c_apmes); @@ -1739,7 +1740,6 @@ hostapd_parse_file(struct hostapd_config *cfg) free(sym); } } - topfile = file; return (errors ? EINVAL : ret); } diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 6e7f2020ec4..80144c6c51d 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.108 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.109 2008/02/27 15:36:42 mpf Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -1728,6 +1728,7 @@ parse_config(const char *filename, int opts) free(conf); return (NULL); } + topfile = file; setservent(1); yyparse(); @@ -2068,7 +2069,6 @@ table_inherit(struct table *tb) h->tablename = tb->conf.name; TAILQ_INSERT_HEAD(&tb->hosts, h, entry); } - topfile = file; conf->sc_tablecount++; TAILQ_INSERT_HEAD(conf->sc_tables, tb, entry); diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y index 18ee46b1770..9d7411a0903 100644 --- a/usr.sbin/ripd/parse.y +++ b/usr.sbin/ripd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.18 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.19 2008/02/27 15:36:42 mpf Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -728,6 +728,7 @@ parse_config(char *filename, int opts) free(conf); return (NULL); } + topfile = file; yyparse(); errors = file->errors; @@ -754,7 +755,6 @@ parse_config(char *filename, int opts) clear_config(conf); return (NULL); } - topfile = file; return (conf); } |