ports/174533: net/openbgpd doesn't reload after config error (previous reload still running)

[Renato Ornelas]

>Number:         174533
>Category:       ports
>Synopsis:       net/openbgpd doesn't reload after config error (previous reload still running)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 18 00:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Renato Ornelas
>Release:        7.3-RELEASE-p2
>Organization:
Open X
>Environment:
FreeBSD bgp1.openx.com.br 7.3-RELEASE-p2 FreeBSD 7.3-RELEASE-p2 #0: Mon Jul 12 19:04:04 UTC 2010     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
After upgrading to openbgp-5.2.20121014, bgpctl cant reload a config after the config file has any error.

Dec 17 18:22:51 bgp2 bgpd[37607]: /etc/bgpd/clientes.conf:855: syntax error
Dec 17 18:22:51 bgp2 bgpd[37607]: /etc/bgpd/clientes.conf:858: start prefixlen is bigger than end
Dec 17 18:22:51 bgp2 bgpd[37607]: config file /usr/local/etc/bgpd.conf has errors, not reloading

After you correct the error, bgpctl reload starts giving the following error:

bgp2# bgpctl re
reload request sent.
previous reload still running


You need to restart openbgpd to correct the error
>How-To-Repeat:
Put any invalid option on the config file, issue a bgpctl reload, correct the file and give another reload to bgpctl
>Fix:
--- src/usr.sbin/bgpd/bgpd.c	2012/09/18 10:45:51	1.169
+++ src/usr.sbin/bgpd/bgpd.c	2012/11/02 19:02:45	1.170
@@ -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 at openbsd.org>
@@ -436,6 +436,7 @@ reconfigure(char *conffile, struct bgpd_config *conf, 
 	    &rdom_l)) {
 		log_warnx("config file %s has errors, not reloading",
 		    conffile);
+		reconfpending = 0;
 		return (1);
 	}
 


>Release-Note:
>Audit-Trail:
>Unformatted: