diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-01-30 23:24:05 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-01-30 23:24:05 +0000 |
| commit | c6406c14858bb197b25f11851838ed1364550375 (patch) | |
| tree | 6fe51d70b035ab2e1f58e2d52601bb93ebd4315c /usr.sbin | |
| parent | 4d9f65ed58911bcd4666f9a0a45c6b3ebd5bdc3d (diff) | |
in the parse_config() -> merge_config() chain, you shall not null
conf->opts that holds some of the command line opts.
repairs -n.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c index 66634813793..852bfa58013 100644 --- a/usr.sbin/bgpd/config.c +++ b/usr.sbin/bgpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.24 2004/01/28 17:24:38 henning Exp $ */ +/* $OpenBSD: config.c,v 1.25 2004/01/30 23:24:04 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -40,6 +40,9 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf, { struct peer *p; + /* preserve cmd line opts */ + conf->opts = xconf->opts; + if (!conf->as) { log_warnx("configuration error: AS not given"); return (1); |