diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2012-11-02 18:02:46 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2012-11-02 18:02:46 +0000 |
| commit | 1cadc25e5be49ae795ccfc33d1753a17e8acb16d (patch) | |
| tree | 72b54cc8c57ade595ab10596c1205a78b6bd8164 /usr.sbin/bgpd | |
| parent | fe79546b4d469cf6a29de75d0d28af7e47b293e4 (diff) | |
Unstick bgpctl reload after reloading a bgpd.conf with errors.
ok claudio, benno
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 13b576d7dd3..72746e2c6e6 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.169 2012/09/18 09:45:51 claudio Exp $ */ +/* $OpenBSD: bgpd.c,v 1.170 2012/11/02 18:02:45 florian Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -436,6 +436,7 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l, &rdom_l)) { log_warnx("config file %s has errors, not reloading", conffile); + reconfpending = 0; return (1); } |